Skip to content

Commit b81520e

Browse files
wing328wing328
committed
update
1 parent cbd8691 commit b81520e

File tree

12 files changed

+682
-275
lines changed

12 files changed

+682
-275
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,20 +282,20 @@ public class {{classname}} {
282282
{{! We could also manipulate the inputstream to remove that bad character, but string manipulation is easier to read and this codepath is not asyncronus so we do not gain anything by reading the stream later. }}
283283
{{! This fix does make it unsuitable for large amounts of data because `InputStream.readAllbytes` is not meant for it, but a syncronus client is already not the right tool for that.}}
284284
if (localVarResponse.body() == null) {
285-
return new ApiResponse<{{{returnType}}}>(
286-
localVarResponse.statusCode(),
287-
localVarResponse.headers().map(),
288-
null
289-
);
285+
return new ApiResponse<{{{returnType}}}>(
286+
localVarResponse.statusCode(),
287+
localVarResponse.headers().map(),
288+
null
289+
);
290290
}
291291

292292
String responseBody = new String(localVarResponse.body().readAllBytes());
293293
localVarResponse.body().close();
294294

295295
return new ApiResponse<{{{returnType}}}>(
296-
localVarResponse.statusCode(),
297-
localVarResponse.headers().map(),
298-
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<{{{returnType}}}>() {})
296+
localVarResponse.statusCode(),
297+
localVarResponse.headers().map(),
298+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<{{{returnType}}}>() {})
299299
);
300300
{{/returnType}}
301301
{{^returnType}}
@@ -310,7 +310,7 @@ public class {{classname}} {
310310
{{^returnType}}
311311
// Drain the InputStream
312312
while (localVarResponse.body().read() != -1) {
313-
// Ignore
313+
// Ignore
314314
}
315315
localVarResponse.body().close();
316316
{{/returnType}}

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java‎

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,21 @@ public ApiResponse<File> testBinaryGifWithHttpInfo() throws ApiException {
120120
if (localVarResponse.statusCode()/ 100 != 2) {
121121
throw getApiException("testBinaryGif", localVarResponse);
122122
}
123+
if (localVarResponse.body() == null) {
124+
return new ApiResponse<File>(
125+
localVarResponse.statusCode(),
126+
localVarResponse.headers().map(),
127+
null
128+
);
129+
}
130+
131+
String responseBody = new String(localVarResponse.body().readAllBytes());
132+
localVarResponse.body().close();
133+
123134
return new ApiResponse<File>(
124-
localVarResponse.statusCode(),
125-
localVarResponse.headers().map(),
126-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<File>() {}) // closes the InputStream
135+
localVarResponse.statusCode(),
136+
localVarResponse.headers().map(),
137+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<File>() {})
127138
);
128139
} finally {
129140
}
@@ -494,10 +505,21 @@ public ApiResponse<Pet> testEchoBodyAllOfPetWithHttpInfo(Pet pet) throws ApiExce
494505
if (localVarResponse.statusCode()/ 100 != 2) {
495506
throw getApiException("testEchoBodyAllOfPet", localVarResponse);
496507
}
508+
if (localVarResponse.body() == null) {
509+
return new ApiResponse<Pet>(
510+
localVarResponse.statusCode(),
511+
localVarResponse.headers().map(),
512+
null
513+
);
514+
}
515+
516+
String responseBody = new String(localVarResponse.body().readAllBytes());
517+
localVarResponse.body().close();
518+
497519
return new ApiResponse<Pet>(
498-
localVarResponse.statusCode(),
499-
localVarResponse.headers().map(),
500-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {}) // closes the InputStream
520+
localVarResponse.statusCode(),
521+
localVarResponse.headers().map(),
522+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<Pet>() {})
501523
);
502524
} finally {
503525
}
@@ -650,10 +672,21 @@ public ApiResponse<Pet> testEchoBodyPetWithHttpInfo(Pet pet) throws ApiException
650672
if (localVarResponse.statusCode()/ 100 != 2) {
651673
throw getApiException("testEchoBodyPet", localVarResponse);
652674
}
675+
if (localVarResponse.body() == null) {
676+
return new ApiResponse<Pet>(
677+
localVarResponse.statusCode(),
678+
localVarResponse.headers().map(),
679+
null
680+
);
681+
}
682+
683+
String responseBody = new String(localVarResponse.body().readAllBytes());
684+
localVarResponse.body().close();
685+
653686
return new ApiResponse<Pet>(
654-
localVarResponse.statusCode(),
655-
localVarResponse.headers().map(),
656-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {}) // closes the InputStream
687+
localVarResponse.statusCode(),
688+
localVarResponse.headers().map(),
689+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<Pet>() {})
657690
);
658691
} finally {
659692
}
@@ -806,10 +839,21 @@ public ApiResponse<StringEnumRef> testEchoBodyStringEnumWithHttpInfo(String body
806839
if (localVarResponse.statusCode()/ 100 != 2) {
807840
throw getApiException("testEchoBodyStringEnum", localVarResponse);
808841
}
842+
if (localVarResponse.body() == null) {
843+
return new ApiResponse<StringEnumRef>(
844+
localVarResponse.statusCode(),
845+
localVarResponse.headers().map(),
846+
null
847+
);
848+
}
849+
850+
String responseBody = new String(localVarResponse.body().readAllBytes());
851+
localVarResponse.body().close();
852+
809853
return new ApiResponse<StringEnumRef>(
810-
localVarResponse.statusCode(),
811-
localVarResponse.headers().map(),
812-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<StringEnumRef>() {}) // closes the InputStream
854+
localVarResponse.statusCode(),
855+
localVarResponse.headers().map(),
856+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<StringEnumRef>() {})
813857
);
814858
} finally {
815859
}

‎samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java‎

Lines changed: 94 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,21 @@ public ApiResponse<Pet> addPetWithHttpInfo(Pet pet) throws ApiException {
121121
if (localVarResponse.statusCode()/ 100 != 2) {
122122
throw getApiException("addPet", localVarResponse);
123123
}
124+
if (localVarResponse.body() == null) {
125+
return new ApiResponse<Pet>(
126+
localVarResponse.statusCode(),
127+
localVarResponse.headers().map(),
128+
null
129+
);
130+
}
131+
132+
String responseBody = new String(localVarResponse.body().readAllBytes());
133+
localVarResponse.body().close();
134+
124135
return new ApiResponse<Pet>(
125-
localVarResponse.statusCode(),
126-
localVarResponse.headers().map(),
127-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {}) // closes the InputStream
136+
localVarResponse.statusCode(),
137+
localVarResponse.headers().map(),
138+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<Pet>() {})
128139
);
129140
} finally {
130141
}
@@ -199,15 +210,15 @@ public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws
199210
if (localVarResponse.statusCode()/ 100 != 2) {
200211
throw getApiException("deletePet", localVarResponse);
201212
}
202-
return new ApiResponse<Void>(
203-
localVarResponse.statusCode(),
204-
localVarResponse.headers().map(),
205-
null
213+
return new ApiResponse<>(
214+
localVarResponse.statusCode(),
215+
localVarResponse.headers().map(),
216+
null
206217
);
207218
} finally {
208219
// Drain the InputStream
209220
while (localVarResponse.body().read() != -1) {
210-
// Ignore
221+
// Ignore
211222
}
212223
localVarResponse.body().close();
213224
}
@@ -280,10 +291,21 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status)
280291
if (localVarResponse.statusCode()/ 100 != 2) {
281292
throw getApiException("findPetsByStatus", localVarResponse);
282293
}
294+
if (localVarResponse.body() == null) {
295+
return new ApiResponse<List<Pet>>(
296+
localVarResponse.statusCode(),
297+
localVarResponse.headers().map(),
298+
null
299+
);
300+
}
301+
302+
String responseBody = new String(localVarResponse.body().readAllBytes());
303+
localVarResponse.body().close();
304+
283305
return new ApiResponse<List<Pet>>(
284-
localVarResponse.statusCode(),
285-
localVarResponse.headers().map(),
286-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {}) // closes the InputStream
306+
localVarResponse.statusCode(),
307+
localVarResponse.headers().map(),
308+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<List<Pet>>() {})
287309
);
288310
} finally {
289311
}
@@ -371,10 +393,21 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) thro
371393
if (localVarResponse.statusCode()/ 100 != 2) {
372394
throw getApiException("findPetsByTags", localVarResponse);
373395
}
396+
if (localVarResponse.body() == null) {
397+
return new ApiResponse<List<Pet>>(
398+
localVarResponse.statusCode(),
399+
localVarResponse.headers().map(),
400+
null
401+
);
402+
}
403+
404+
String responseBody = new String(localVarResponse.body().readAllBytes());
405+
localVarResponse.body().close();
406+
374407
return new ApiResponse<List<Pet>>(
375-
localVarResponse.statusCode(),
376-
localVarResponse.headers().map(),
377-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {}) // closes the InputStream
408+
localVarResponse.statusCode(),
409+
localVarResponse.headers().map(),
410+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<List<Pet>>() {})
378411
);
379412
} finally {
380413
}
@@ -458,10 +491,21 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
458491
if (localVarResponse.statusCode()/ 100 != 2) {
459492
throw getApiException("getPetById", localVarResponse);
460493
}
494+
if (localVarResponse.body() == null) {
495+
return new ApiResponse<Pet>(
496+
localVarResponse.statusCode(),
497+
localVarResponse.headers().map(),
498+
null
499+
);
500+
}
501+
502+
String responseBody = new String(localVarResponse.body().readAllBytes());
503+
localVarResponse.body().close();
504+
461505
return new ApiResponse<Pet>(
462-
localVarResponse.statusCode(),
463-
localVarResponse.headers().map(),
464-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {}) // closes the InputStream
506+
localVarResponse.statusCode(),
507+
localVarResponse.headers().map(),
508+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<Pet>() {})
465509
);
466510
} finally {
467511
}
@@ -535,10 +579,21 @@ public ApiResponse<Pet> updatePetWithHttpInfo(Pet pet) throws ApiException {
535579
if (localVarResponse.statusCode()/ 100 != 2) {
536580
throw getApiException("updatePet", localVarResponse);
537581
}
582+
if (localVarResponse.body() == null) {
583+
return new ApiResponse<Pet>(
584+
localVarResponse.statusCode(),
585+
localVarResponse.headers().map(),
586+
null
587+
);
588+
}
589+
590+
String responseBody = new String(localVarResponse.body().readAllBytes());
591+
localVarResponse.body().close();
592+
538593
return new ApiResponse<Pet>(
539-
localVarResponse.statusCode(),
540-
localVarResponse.headers().map(),
541-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {}) // closes the InputStream
594+
localVarResponse.statusCode(),
595+
localVarResponse.headers().map(),
596+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<Pet>() {})
542597
);
543598
} finally {
544599
}
@@ -615,15 +670,15 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name,
615670
if (localVarResponse.statusCode()/ 100 != 2) {
616671
throw getApiException("updatePetWithForm", localVarResponse);
617672
}
618-
return new ApiResponse<Void>(
619-
localVarResponse.statusCode(),
620-
localVarResponse.headers().map(),
621-
null
673+
return new ApiResponse<>(
674+
localVarResponse.statusCode(),
675+
localVarResponse.headers().map(),
676+
null
622677
);
623678
} finally {
624679
// Drain the InputStream
625680
while (localVarResponse.body().read() != -1) {
626-
// Ignore
681+
// Ignore
627682
}
628683
localVarResponse.body().close();
629684
}
@@ -714,10 +769,21 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String a
714769
if (localVarResponse.statusCode()/ 100 != 2) {
715770
throw getApiException("uploadFile", localVarResponse);
716771
}
772+
if (localVarResponse.body() == null) {
773+
return new ApiResponse<ModelApiResponse>(
774+
localVarResponse.statusCode(),
775+
localVarResponse.headers().map(),
776+
null
777+
);
778+
}
779+
780+
String responseBody = new String(localVarResponse.body().readAllBytes());
781+
localVarResponse.body().close();
782+
717783
return new ApiResponse<ModelApiResponse>(
718-
localVarResponse.statusCode(),
719-
localVarResponse.headers().map(),
720-
localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {}) // closes the InputStream
784+
localVarResponse.statusCode(),
785+
localVarResponse.headers().map(),
786+
responseBody.isBlank()? null: memberVarObjectMapper.readValue(responseBody, new TypeReference<ModelApiResponse>() {})
721787
);
722788
} finally {
723789
}

0 commit comments

Comments
 (0)