remove thread unsafe statusCode and responseHeaders instance variables

aaronforest-wf · Jul 2, 2024 · 4dbf174 · 4dbf174
1 parent 376505c
commit 4dbf174
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 66 deletions.
diff --git a/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -125,9 +125,6 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   private Map<String, Authentication> authentications;
 
-  private int statusCode;
-  private Map<String, List<String>> responseHeaders;
-
   private DateFormat dateFormat;
 
   // Methods that can have a request body
@@ -274,23 +271,6 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return this;
   }
 
-  /**
-   * Gets the status code of the previous request
-   *
-   * @return Status code
-   */
-  public int getStatusCode() {
-    return statusCode;
-  }
-
-  /**
-   * Gets the response headers of the previous request
-   * @return Response headers
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
-
   /**
    * Get authentications (key: authentication name, value: authentication).
    * @return Map of authentication
@@ -863,6 +843,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
       // convert input stream to string
       return (T) EntityUtils.toString(entity);
     } else {
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",
           response.getCode(),
@@ -1008,16 +989,16 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   }
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
-    statusCode = response.getCode();
+    int statusCode = response.getCode();
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
-    responseHeaders = transformResponseHeaders(response.getHeaders());
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);
     } else {
       String message = EntityUtils.toString(response.getEntity());
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(message, statusCode, responseHeaders, message);
     }
   }

diff --git a/...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -103,9 +103,6 @@ public class ApiClient extends JavaTimeFormatter {
 
   private Map<String, Authentication> authentications;
 
-  private int statusCode;
-  private Map<String, List<String>> responseHeaders;
-
   private DateFormat dateFormat;
 
   // Methods that can have a request body
@@ -245,23 +242,6 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
     return this;
   }
 
-  /**
-   * Gets the status code of the previous request
-   *
-   * @return Status code
-   */
-  public int getStatusCode() {
-    return statusCode;
-  }
-
-  /**
-   * Gets the response headers of the previous request
-   * @return Response headers
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
-
   /**
    * Get authentications (key: authentication name, value: authentication).
    * @return Map of authentication
@@ -781,6 +761,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
       // convert input stream to string
       return (T) EntityUtils.toString(entity);
     } else {
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",
           response.getCode(),
@@ -926,16 +907,16 @@ protected Cookie buildCookie(String key, String value, URI uri) {
   }
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
-    statusCode = response.getCode();
+    int statusCode = response.getCode();
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
-    responseHeaders = transformResponseHeaders(response.getHeaders());
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);
     } else {
       String message = EntityUtils.toString(response.getEntity());
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(message, statusCode, responseHeaders, message);
     }
   }

diff --git a/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -148,9 +148,6 @@ public class ApiClient extends JavaTimeFormatter {
 
   private Map<String, Authentication> authentications;
 
-  private int statusCode;
-  private Map<String, List<String>> responseHeaders;
-
   private DateFormat dateFormat;
 
   // Methods that can have a request body
@@ -293,23 +290,6 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
     return this;
   }
 
-  /**
-   * Gets the status code of the previous request
-   *
-   * @return Status code
-   */
-  public int getStatusCode() {
-    return statusCode;
-  }
-
-  /**
-   * Gets the response headers of the previous request
-   * @return Response headers
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
-
   /**
    * Get authentications (key: authentication name, value: authentication).
    * @return Map of authentication
@@ -874,6 +854,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
       // convert input stream to string
       return (T) EntityUtils.toString(entity);
     } else {
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",
           response.getCode(),
@@ -1019,16 +1000,16 @@ protected Cookie buildCookie(String key, String value, URI uri) {
   }
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
-    statusCode = response.getCode();
+    int statusCode = response.getCode();
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
-    responseHeaders = transformResponseHeaders(response.getHeaders());
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);
     } else {
       String message = EntityUtils.toString(response.getEntity());
+      Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
       throw new ApiException(message, statusCode, responseHeaders, message);
     }
   }