From 4bead807238c5f428dd4958e5947a81ca0ffa520 Mon Sep 17 00:00:00 2001 From: Panos Argyrakis <panargirakis@gmail.com> Date: Fri, 22 Apr 2022 16:36:16 -0400 Subject: [PATCH 1/5] added getMessage() override --- .../Java/libraries/okhttp-gson/apiException.mustache | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache index 9b50c429ef2..237cdb8b860 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache @@ -162,6 +162,16 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us public String getResponseBody() { return responseBody; } + + /** + * Get the exception message including HTTP response data. + * + * @return The exception message + */ + public String getMessage() { + return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + } {{#errorObjectType}} /** -- GitLab From b9646f59e66a96dc1f5b9587984d3d5ba9d4e23b Mon Sep 17 00:00:00 2001 From: Panos Argyrakis <panargirakis@gmail.com> Date: Fri, 22 Apr 2022 16:38:52 -0400 Subject: [PATCH 2/5] Updated samples --- .../java/org/openapitools/client/ApiException.java | 10 ++++++++++ .../java/org/openapitools/client/ApiException.java | 10 ++++++++++ .../java/org/openapitools/client/ApiException.java | 10 ++++++++++ .../java/org/openapitools/client/ApiException.java | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java index 869f54f325d..d799ad910df 100644 --- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java @@ -153,4 +153,14 @@ public class ApiException extends Exception { public String getResponseBody() { return responseBody; } + + /** + * Get the exception message including HTTP response data. + * + * @return The exception message + */ + public String getMessage() { + return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + } } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java index 8a6d4981ca7..4f4b9d34a88 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java @@ -153,4 +153,14 @@ public class ApiException extends Exception { public String getResponseBody() { return responseBody; } + + /** + * Get the exception message including HTTP response data. + * + * @return The exception message + */ + public String getMessage() { + return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + } } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java index 8a6d4981ca7..4f4b9d34a88 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java @@ -153,4 +153,14 @@ public class ApiException extends Exception { public String getResponseBody() { return responseBody; } + + /** + * Get the exception message including HTTP response data. + * + * @return The exception message + */ + public String getMessage() { + return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + } } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java index 8a6d4981ca7..4f4b9d34a88 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java @@ -153,4 +153,14 @@ public class ApiException extends Exception { public String getResponseBody() { return responseBody; } + + /** + * Get the exception message including HTTP response data. + * + * @return The exception message + */ + public String getMessage() { + return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + } } -- GitLab From 2436480e0b4f7ae352c8a59ce49d56bcebbf55ce Mon Sep 17 00:00:00 2001 From: Panos Argyrakis <panargirakis@gmail.com> Date: Fri, 22 Apr 2022 23:05:34 -0400 Subject: [PATCH 3/5] Updated test to expect new message format --- .../src/test/java/org/openapitools/client/api/PetApiTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java index 5223152adba..c3b8bf25720 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -222,7 +222,8 @@ public class PetApiTest { } while (result.isEmpty()); assertNotNull(exception); assertEquals(404, exception.getCode()); - assertEquals("Not Found", exception.getMessage()); + String pattern = "^Message: .*\\RHTTP response code: 404\\RHTTP response body: .*\\RHTTP response headers: .*$"; + assertTrue(exception.getMessage().matches(pattern)); assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0)); api.deletePet(pet.getId(), null); } -- GitLab From 0a3c6f3a2ae5829fe752228dfc041d44b3aeca2c Mon Sep 17 00:00:00 2001 From: Panos Argyrakis <panargirakis@gmail.com> Date: Fri, 22 Apr 2022 23:19:42 -0400 Subject: [PATCH 4/5] Updated pattern to expect specific message --- .../src/test/java/org/openapitools/client/api/PetApiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java index c3b8bf25720..89fe1d01c46 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -222,7 +222,7 @@ public class PetApiTest { } while (result.isEmpty()); assertNotNull(exception); assertEquals(404, exception.getCode()); - String pattern = "^Message: .*\\RHTTP response code: 404\\RHTTP response body: .*\\RHTTP response headers: .*$"; + String pattern = "^Message: Not Found\\RHTTP response code: 404\\RHTTP response body: .*\\RHTTP response headers: .*$"; assertTrue(exception.getMessage().matches(pattern)); assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0)); api.deletePet(pet.getId(), null); -- GitLab From bddfd5a5277348f8d4a8881c2166dd6726476e50 Mon Sep 17 00:00:00 2001 From: Panos Argyrakis <panargirakis@gmail.com> Date: Fri, 22 Apr 2022 23:43:27 -0400 Subject: [PATCH 5/5] updated to platform agnostic line separators --- .../resources/Java/libraries/okhttp-gson/apiException.mustache | 2 +- .../src/main/java/org/openapitools/client/ApiException.java | 2 +- .../src/main/java/org/openapitools/client/ApiException.java | 2 +- .../src/main/java/org/openapitools/client/ApiException.java | 2 +- .../src/main/java/org/openapitools/client/ApiException.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache index 237cdb8b860..c0378944aea 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache @@ -169,7 +169,7 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us * @return The exception message */ public String getMessage() { - return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); } {{#errorObjectType}} diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java index d799ad910df..4f1a2f6ce8c 100644 --- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java @@ -160,7 +160,7 @@ public class ApiException extends Exception { * @return The exception message */ public String getMessage() { - return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); } } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java index 4f4b9d34a88..da9b4595b06 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java @@ -160,7 +160,7 @@ public class ApiException extends Exception { * @return The exception message */ public String getMessage() { - return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); } } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java index 4f4b9d34a88..da9b4595b06 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java @@ -160,7 +160,7 @@ public class ApiException extends Exception { * @return The exception message */ public String getMessage() { - return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); } } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java index 4f4b9d34a88..da9b4595b06 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java @@ -160,7 +160,7 @@ public class ApiException extends Exception { * @return The exception message */ public String getMessage() { - return String.format("Message: %s\nHTTP response code: %s\nHTTP response body: %s\nHTTP response headers: %s", + return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); } } -- GitLab