From 9b292b6679b299b2659facfbe6e338edced62dcb Mon Sep 17 00:00:00 2001
From: Rubini <angelroobs@gmail.com>
Date: Tue, 12 Dec 2023 21:24:52 +0530
Subject: [PATCH 1/2] Fix with handling error

---
 .../resources/Java/libraries/resttemplate/ApiClient.mustache  | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 .../src/main/java/org/openapitools/client/ApiClient.java      | 4 ++++
 8 files changed, 32 insertions(+)

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
index f641d8e16d96..306ac73c2ce6 100644
--- 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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
index cd4196b5c211..202e89a27ced 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
index 14e600e64462..b3378b3d2ce2 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/others/java/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
index 6d065b370a7a..607b34844ca0 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
index 446c2c721a36..475e48e9dc3a 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
index 446c2c721a36..475e48e9dc3a 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
index 72282e70426c..908b04812b4a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
index f20fc5eb7cc8..6aaa42e453e1 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/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 " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+        }
+
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         } else {

From 153023ad7334b96cf43840589f597e744e49a34d Mon Sep 17 00:00:00 2001
From: Rubini <angelroobs@gmail.com>
Date: Tue, 12 Dec 2023 21:36:14 +0530
Subject: [PATCH 2/2] Fix with handling error

---
 .../resources/Java/libraries/resttemplate/ApiClient.mustache    | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 .../src/main/java/org/openapitools/client/ApiClient.java        | 2 +-
 8 files changed, 8 insertions(+), 8 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
index 306ac73c2ce6..26e1493e0373 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
@@ -785,7 +785,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
index 202e89a27ced..15a1b9c79b7b 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -701,7 +701,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
index b3378b3d2ce2..0d9f0d1498c7 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
@@ -644,7 +644,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
index 607b34844ca0..313b5ae1290f 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -693,7 +693,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
index 475e48e9dc3a..da9e4a41e72c 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -693,7 +693,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
index 475e48e9dc3a..da9e4a41e72c 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -693,7 +693,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
index 908b04812b4a..9e0aacc576a5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
@@ -756,7 +756,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
index 6aaa42e453e1..1f71044281a7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -751,7 +751,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
         }
 
         if (responseEntity == null) {
-            throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler");
+            throw new RestClientException("API returned HttpServerErrorException");
         }
 
         if (responseEntity.getStatusCode().is2xxSuccessful()) {