loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge branch 'master' of https://github.com/OpenAPITools/openapi-generator

Browse Source
This commit is contained in:
William Cheng 2019-08-25 18:05:50 +08:00
commit cba2d3b8cf
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));