re-add status code and header getters for backwards compatibility

aaronforest-wf · Jul 3, 2024 · 3f85c2a · 3f85c2a
1 parent 4dbf174
commit 3f85c2a
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 3 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
@@ -124,6 +124,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected String tempFolderPath = null;
 
   private Map<String, Authentication> authentications;
+
+  private Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
+  private Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
 
   private DateFormat dateFormat;
 
@@ -270,6 +273,25 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     this.serverVariables = serverVariables;
     return this;
   }
+
+  /**
+   * Gets the status code of the previous request
+   *
+   * @return Status code
+   */
+  @Deprecated
+  public int getStatusCode() {
+    return lastStatusCodeByThread.get(Thread.currentThread().threadId());
+  }
+
+  /**
+   * Gets the response headers of the previous request
+   * @return Response headers
+   */
+  @Deprecated
+  public Map<String, List<String>> getResponseHeaders() {
+    return lastResponseHeadersByThread.get(Thread.currentThread().threadId());
+  }
 
   /**
    * Get authentications (key: authentication name, value: authentication).
@@ -990,15 +1012,18 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
+    lastStatusCodeByThread.put(Thread.currentThread().threadId(), statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
+    Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
+    lastResponseHeadersByThread.put(Thread.currentThread().threadId(), responseHeaders);
+
     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
@@ -102,6 +102,9 @@ public class ApiClient extends JavaTimeFormatter {
   protected String tempFolderPath = null;
 
   private Map<String, Authentication> authentications;
+
+  private Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
+  private Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
 
   private DateFormat dateFormat;
 
@@ -241,6 +244,25 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
     return this;
   }
+
+  /**
+   * Gets the status code of the previous request
+   *
+   * @return Status code
+   */
+  @Deprecated
+  public int getStatusCode() {
+    return lastStatusCodeByThread.get(Thread.currentThread().threadId());
+  }
+
+  /**
+   * Gets the response headers of the previous request
+   * @return Response headers
+   */
+  @Deprecated
+  public Map<String, List<String>> getResponseHeaders() {
+    return lastResponseHeadersByThread.get(Thread.currentThread().threadId());
+  }
 
   /**
    * Get authentications (key: authentication name, value: authentication).
@@ -908,15 +930,18 @@ protected Cookie buildCookie(String key, String value, URI uri) {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
+    lastStatusCodeByThread.put(Thread.currentThread().threadId(), statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
+    Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
+    lastResponseHeadersByThread.put(Thread.currentThread().threadId(), responseHeaders);
+
     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
@@ -147,6 +147,9 @@ public class ApiClient extends JavaTimeFormatter {
   protected String tempFolderPath = null;
 
   private Map<String, Authentication> authentications;
+
+  private Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
+  private Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
 
   private DateFormat dateFormat;
 
@@ -289,6 +292,25 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
     return this;
   }
+
+  /**
+   * Gets the status code of the previous request
+   *
+   * @return Status code
+   */
+  @Deprecated
+  public int getStatusCode() {
+    return lastStatusCodeByThread.get(Thread.currentThread().threadId());
+  }
+
+  /**
+   * Gets the response headers of the previous request
+   * @return Response headers
+   */
+  @Deprecated
+  public Map<String, List<String>> getResponseHeaders() {
+    return lastResponseHeadersByThread.get(Thread.currentThread().threadId());
+  }
 
   /**
    * Get authentications (key: authentication name, value: authentication).
@@ -1001,15 +1023,18 @@ protected Cookie buildCookie(String key, String value, URI uri) {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
+    lastStatusCodeByThread.put(Thread.currentThread().threadId(), statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
+    Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
+    lastResponseHeadersByThread.put(Thread.currentThread().threadId(), responseHeaders);
+
     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);
     }
   }