Fix for handling error in resttemplate (#17381)

* Fix with handling error * Fix with handling error
OpenAPITools · Dec 13, 2023 · 4c4388e · 4c4388e
1 parent 64c85a8
commit 4c4388e
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
@@ -784,6 +784,10 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/...es/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/...es/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -700,6 +700,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/.../resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/.../resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
@@ -643,6 +643,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/...t/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -692,6 +692,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/.../petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/.../petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -692,6 +692,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/.../petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/.../petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -692,6 +692,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
@@ -755,6 +755,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

diff --git a/...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -750,6 +750,10 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             }
         }
 
+        if (responseEntity == null) {
+            throw new RestClientException("API returned HttpServerErrorException");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {