From 40e04df0966e344d1c2a1ebb901c85d47e5707bb Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Thu, 17 Nov 2022 17:27:59 +0200 Subject: [PATCH] [Java][Native] handle empty response body (#13993) --- .../Java/libraries/native/api.mustache | 11 ++++--- .../client/api/AnotherFakeApi.java | 6 ++-- .../org/openapitools/client/api/FakeApi.java | 30 ++++++++++++------- .../client/api/FakeClassnameTags123Api.java | 6 ++-- .../org/openapitools/client/api/PetApi.java | 30 ++++++++++++------- .../org/openapitools/client/api/StoreApi.java | 18 +++++++---- .../org/openapitools/client/api/UserApi.java | 12 +++++--- .../client/api/AnotherFakeApi.java | 3 +- .../org/openapitools/client/api/FakeApi.java | 15 ++++++---- .../client/api/FakeClassnameTags123Api.java | 3 +- .../org/openapitools/client/api/PetApi.java | 15 ++++++---- .../org/openapitools/client/api/StoreApi.java | 9 ++++-- .../org/openapitools/client/api/UserApi.java | 6 ++-- 13 files changed, 109 insertions(+), 55 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache index 0255e20c1fc3..4d30cbe57b2c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache @@ -185,8 +185,9 @@ public class {{classname}} { } {{#returnType}} try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference<{{{returnType}}}>() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -236,10 +237,11 @@ public class {{classname}} { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("{{operationId}}", localVarResponse); } - return new ApiResponse<{{{returnType}}}{{^returnType}}Void{{/returnType}}>( + {{#returnType}}InputStream responseBody = localVarResponse.body(); + {{/returnType}}return new ApiResponse<{{{returnType}}}{{^returnType}}Void{{/returnType}}>( localVarResponse.statusCode(), localVarResponse.headers().map(), - {{#returnType}}memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {}) // closes the InputStream{{/returnType}} + {{#returnType}}responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference<{{{returnType}}}>() {}) // closes the InputStream{{/returnType}} {{^returnType}}null{{/returnType}} ); } finally { @@ -273,11 +275,12 @@ public class {{classname}} { } {{#returnType}} try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse<{{{returnType}}}>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference<{{{returnType}}}>() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index f90b4a8b8d7b..729e87bdcb0e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -92,8 +92,9 @@ public class AnotherFakeApi { return CompletableFuture.failedFuture(getApiException("call123testSpecialTags", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -125,11 +126,12 @@ public class AnotherFakeApi { return CompletableFuture.failedFuture(getApiException("call123testSpecialTags", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index a298ba02b759..80be8d99f2c3 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -183,8 +183,9 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterBooleanSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -216,11 +217,12 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterBooleanSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -275,8 +277,9 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterCompositeSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -308,11 +311,12 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterCompositeSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -367,8 +371,9 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterNumberSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -400,11 +405,12 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterNumberSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -459,8 +465,9 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterStringSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -492,11 +499,12 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("fakeOuterStringSerialize", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -727,8 +735,9 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("testClientModel", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -760,11 +769,12 @@ public class FakeApi { return CompletableFuture.failedFuture(getApiException("testClientModel", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index d95460c37728..d70a04ac7257 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -92,8 +92,9 @@ public class FakeClassnameTags123Api { return CompletableFuture.failedFuture(getApiException("testClassname", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -125,11 +126,12 @@ public class FakeClassnameTags123Api { return CompletableFuture.failedFuture(getApiException("testClassname", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 8c25d40efdb2..7a473d5882f9 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -261,8 +261,9 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("findPetsByStatus", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -294,11 +295,12 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("findPetsByStatus", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -362,8 +364,9 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("findPetsByTags", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -397,11 +400,12 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("findPetsByTags", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -463,8 +467,9 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("getPetById", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -496,11 +501,12 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("getPetById", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -721,8 +727,9 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("uploadFile", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -756,11 +763,12 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("uploadFile", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -816,8 +824,9 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("uploadFileWithRequiredFile", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -851,11 +860,12 @@ public class PetApi { return CompletableFuture.failedFuture(getApiException("uploadFileWithRequiredFile", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java index 8a4ab19b2071..73fbf0c1bde4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java @@ -169,8 +169,9 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("getInventory", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -201,11 +202,12 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("getInventory", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -254,8 +256,9 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("getOrderById", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -287,11 +290,12 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("getOrderById", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -345,8 +349,9 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("placeOrder", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -378,11 +383,12 @@ public class StoreApi { return CompletableFuture.failedFuture(getApiException("placeOrder", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java index 00baaa16c9df..57fb6bf7a8c1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java @@ -420,8 +420,9 @@ public class UserApi { return CompletableFuture.failedFuture(getApiException("getUserByName", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -453,11 +454,12 @@ public class UserApi { return CompletableFuture.failedFuture(getApiException("getUserByName", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -512,8 +514,9 @@ public class UserApi { return CompletableFuture.failedFuture(getApiException("loginUser", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); @@ -546,11 +549,12 @@ public class UserApi { return CompletableFuture.failedFuture(getApiException("loginUser", localVarResponse)); } try { + String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {})) + responseBody == null || responseBody.isBlank() ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {})) ); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 89012de66a1e..c647634e917f 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -106,10 +106,11 @@ public class AnotherFakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("call123testSpecialTags", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 99907ea48c0e..382ae5e0c543 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -195,10 +195,11 @@ public class FakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("fakeOuterBooleanSerialize", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -269,10 +270,11 @@ public class FakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("fakeOuterCompositeSerialize", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -343,10 +345,11 @@ public class FakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("fakeOuterNumberSerialize", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -417,10 +420,11 @@ public class FakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("fakeOuterStringSerialize", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -663,10 +667,11 @@ public class FakeApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("testClientModel", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 771eac351efa..97a6e1fd2b83 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -106,10 +106,11 @@ public class FakeClassnameTags123Api { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("testClassname", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index e9a450449afe..eb825b755555 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -271,10 +271,11 @@ public class PetApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("findPetsByStatus", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) // closes the InputStream ); } finally { @@ -356,10 +357,11 @@ public class PetApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("findPetsByTags", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) // closes the InputStream ); } finally { @@ -437,10 +439,11 @@ public class PetApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("getPetById", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -675,10 +678,11 @@ public class PetApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("uploadFile", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -752,10 +756,11 @@ public class PetApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("uploadFileWithRequiredFile", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java index 75fca36444d3..c813f3c22ecb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java @@ -180,10 +180,11 @@ public class StoreApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("getInventory", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse>( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference>() {}) // closes the InputStream ); } finally { @@ -248,10 +249,11 @@ public class StoreApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("getOrderById", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -321,10 +323,11 @@ public class StoreApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("placeOrder", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java index c260c74f1e2d..7617c7c60f09 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java @@ -426,10 +426,11 @@ public class UserApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("getUserByName", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally { @@ -501,10 +502,11 @@ public class UserApi { if (localVarResponse.statusCode()/ 100 != 2) { throw getApiException("loginUser", localVarResponse); } + InputStream responseBody = localVarResponse.body(); return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + responseBody == null || responseBody.available() < 1 ? null : memberVarObjectMapper.readValue(responseBody, new TypeReference() {}) // closes the InputStream ); } finally {