loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-06-29 20:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Two tiny fixes for Java Vertx client (#3683)

Browse Source 
* two tiny fixes:

1.) ApiClient already defines and configures an objectMapper to not fail on unknown properties, but it is not used when parsing the response. The fix uses the pre-configured object mapper instead of the vertx default one

2.) When an operation has no response (or just ones without content), the accept array passed to ApiClient is emtpy. This makes the null check in ApiClient useless, as it still tries to set a null Accept header, which is refused with an NPE. Amend the check with .length > 0 to catch this case.

* update generated client as required by contributor guidelines
This commit is contained in:
FlorianBruckner 2019-08-25 12:02:36 +02:00 committed by William Cheng
parent 859df23428
commit 16ac05dcdf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache vendored
View File

@ -444,7 +444,7 @@ public class ApiClient {
updateParamsForAuth(authNames, queryParams, headerParams); updateParamsForAuth(authNames, queryParams, headerParams);
if (accepts != null) { if (accepts != null && accepts.length > 0) {
headerParams.add(HttpHeaders.ACCEPT, selectHeaderAccept(accepts)); headerParams.add(HttpHeaders.ACCEPT, selectHeaderAccept(accepts));
} }
@ -579,7 +579,7 @@ public class ApiClient {
return; return;
} else { } else {
try { try {
resultContent = Json.mapper.readValue(httpResponse.bodyAsString(), returnType); resultContent = this.objectMapper.readValue(httpResponse.bodyAsString(), returnType);
result = Future.succeededFuture(resultContent); result = Future.succeededFuture(resultContent);
} catch (Exception e) { } catch (Exception e) {
result = ApiException.fail(new DecodeException("Failed to decode:" + e.getMessage(), e)); result = ApiException.fail(new DecodeException("Failed to decode:" + e.getMessage(), e));

4
samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -440,7 +440,7 @@ public class ApiClient {
updateParamsForAuth(authNames, queryParams, headerParams); updateParamsForAuth(authNames, queryParams, headerParams);
if (accepts != null) { if (accepts != null && accepts.length > 0) {
headerParams.add(HttpHeaders.ACCEPT, selectHeaderAccept(accepts)); headerParams.add(HttpHeaders.ACCEPT, selectHeaderAccept(accepts));
} }
@ -575,7 +575,7 @@ public class ApiClient {
return; return;
} else { } else {
try { try {
resultContent = Json.mapper.readValue(httpResponse.bodyAsString(), returnType); resultContent = this.objectMapper.readValue(httpResponse.bodyAsString(), returnType);
result = Future.succeededFuture(resultContent); result = Future.succeededFuture(resultContent);
} catch (Exception e) { } catch (Exception e) {
result = ApiException.fail(new DecodeException("Failed to decode:" + e.getMessage(), e)); result = ApiException.fail(new DecodeException("Failed to decode:" + e.getMessage(), e));