loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-10 19:52:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve errorObjectType to avoid regression (#12131)

Browse Source
This commit is contained in:
William Cheng
2022-04-14 16:31:42 +08:00
committed by GitHub
parent 1deaaa88fe
commit c533deb9a9
26 changed files with 133 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache vendored
View File

@@ -327,14 +327,20 @@ public class {{classname}} {
public{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}private{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-streaming}} InputStream {{operationId}}WithHttpInfo({{#allParams}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException { public{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}private{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-streaming}} InputStream {{operationId}}WithHttpInfo({{#allParams}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException {
okhttp3.Call localVarCall = {{operationId}}ValidateBeforeCall({{#allParams}}{{paramName}}, {{/allParams}}null); okhttp3.Call localVarCall = {{operationId}}ValidateBeforeCall({{#allParams}}{{paramName}}, {{/allParams}}null);
{{#returnType}} {{#returnType}}
{{#errorObjectType}}
try { try {
Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType(); Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
return localVarApiClient.executeStream(localVarCall, localVarReturnType); return localVarApiClient.executeStream(localVarCall, localVarReturnType);
} catch (ApiException e) { } catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<{{{errorObjectType}}}{{^errorObjectType}}{{{returnType}}}{{/errorObjectType}}>(){}.getType())); e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<{{{errorObjectType}}}>(){}.getType()));
e.setErrorObjectType(new GenericType<{{{errorObjectType}}}{{^errorObjectType}}{{{returnType}}}{{/errorObjectType}}>(){}); e.setErrorObjectType(new GenericType<{{{errorObjectType}}}>(){});
throw e; throw e;
} }
{{/errorObjectType}}
{{^errorObjectType}}
Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
return localVarApiClient.executeStream(localVarCall, localVarReturnType);
{{/errorObjectType}}
{{/returnType}} {{/returnType}}
} }
{{/vendorExtensions.x-streaming}}{{^vendorExtensions.x-streaming}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException { {{/vendorExtensions.x-streaming}}{{^vendorExtensions.x-streaming}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException {
@@ -343,14 +349,20 @@ public class {{classname}} {
return localVarApiClient.execute(localVarCall); return localVarApiClient.execute(localVarCall);
{{/returnType}} {{/returnType}}
{{#returnType}} {{#returnType}}
{{#errorObjectType}}
try { try {
Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType(); Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
return localVarApiClient.execute(localVarCall, localVarReturnType); return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) { } catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<{{{errorObjectType}}}{{^errorObjectType}}{{{returnType}}}{{/errorObjectType}}>(){}.getType())); e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<{{{errorObjectType}}}>(){}.getType()));
e.setErrorObjectType(new GenericType<{{{errorObjectType}}}{{^errorObjectType}}{{{returnType}}}{{/errorObjectType}}>(){}); e.setErrorObjectType(new GenericType<{{{errorObjectType}}}>(){});
throw e; throw e;
} }
{{/errorObjectType}}
{{^errorObjectType}}
Type localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
return localVarApiClient.execute(localVarCall, localVarReturnType);
{{/errorObjectType}}
{{/returnType}} {{/returnType}}
} }
{{/vendorExtensions.x-streaming}} {{/vendorExtensions.x-streaming}}

10
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache vendored
View File

@@ -20,8 +20,10 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
private int code = 0; private int code = 0;
private Map<String, List<String>> responseHeaders = null; private Map<String, List<String>> responseHeaders = null;
private String responseBody = null; private String responseBody = null;
private {{{errorObjectType}}}{{^errorObjectType}}Object{{/errorObjectType}} errorObject = null; {{#errorObjectType}}
private {{{errorObjectType}}} errorObject = null;
private GenericType errorObjectType = null; private GenericType errorObjectType = null;
{{/errorObjectType}}
/** /**
* <p>Constructor for ApiException.</p> * <p>Constructor for ApiException.</p>
@@ -160,6 +162,7 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
public String getResponseBody() { public String getResponseBody() {
return responseBody; return responseBody;
} }
{{#errorObjectType}}
/** /**
* Get the error object type. * Get the error object type.
@@ -184,7 +187,7 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
* *
* @return Error object * @return Error object
*/ */
public {{{errorObjectType}}}{{^errorObjectType}}Object{{/errorObjectType}} getErrorObject() { public {{{errorObjectType}}} getErrorObject() {
return errorObject; return errorObject;
} }
@@ -193,7 +196,8 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
* *
* @param errorObject Error object * @param errorObject Error object
*/ */
public void setErrorObject({{{errorObjectType}}}{{^errorObjectType}}Object{{/errorObjectType}} errorObject) { public void setErrorObject({{{errorObjectType}}} errorObject) {
this.errorObject = errorObject; this.errorObject = errorObject;
} }
{{/errorObjectType}}
} }

38
samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiException.java
View File

@@ -27,8 +27,6 @@ public class ApiException extends Exception {
private int code = 0; private int code = 0;
private Map<String, List<String>> responseHeaders = null; private Map<String, List<String>> responseHeaders = null;
private String responseBody = null; private String responseBody = null;
private Object errorObject = null;
private GenericType errorObjectType = null;
/** /**
* <p>Constructor for ApiException.</p> * <p>Constructor for ApiException.</p>
@@ -155,40 +153,4 @@ public class ApiException extends Exception {
public String getResponseBody() { public String getResponseBody() {
return responseBody; return responseBody;
} }
/**
* Get the error object type.
*
* @return Error object type
*/
public GenericType getErrorObjectType() {
return errorObjectType;
}
/**
* Set the error object type.
*
* @param errorObjectType object type
*/
public void setErrorObjectType(GenericType errorObjectType) {
this.errorObjectType = errorObjectType;
}
/**
* Get the error object.
*
* @return Error object
*/
public Object getErrorObject() {
return errorObject;
}
/**
* Get the error object.
*
* @param errorObject Error object
*/
public void setErrorObject(Object errorObject) {
this.errorObject = errorObject;
}
} }

10
samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/api/PingApi.java
View File

@@ -171,14 +171,8 @@ public class PingApi {
*/ */
public InputStream postPingWithHttpInfo(SomeObj someObj) throws ApiException { public InputStream postPingWithHttpInfo(SomeObj someObj) throws ApiException {
okhttp3.Call localVarCall = postPingValidateBeforeCall(someObj, null); okhttp3.Call localVarCall = postPingValidateBeforeCall(someObj, null);
try { Type localVarReturnType = new TypeToken<SomeObj>(){}.getType();
Type localVarReturnType = new TypeToken<SomeObj>(){}.getType(); return localVarApiClient.executeStream(localVarCall, localVarReturnType);
return localVarApiClient.executeStream(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<SomeObj>(){}.getType()));
e.setErrorObjectType(new GenericType<SomeObj>(){});
throw e;
}
} }
/** /**

38
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiException.java
View File

@@ -27,8 +27,6 @@ public class ApiException extends Exception {
private int code = 0; private int code = 0;
private Map<String, List<String>> responseHeaders = null; private Map<String, List<String>> responseHeaders = null;
private String responseBody = null; private String responseBody = null;
private Object errorObject = null;
private GenericType errorObjectType = null;
/** /**
* <p>Constructor for ApiException.</p> * <p>Constructor for ApiException.</p>
@@ -155,40 +153,4 @@ public class ApiException extends Exception {
public String getResponseBody() { public String getResponseBody() {
return responseBody; return responseBody;
} }
/**
* Get the error object type.
*
* @return Error object type
*/
public GenericType getErrorObjectType() {
return errorObjectType;
}
/**
* Set the error object type.
*
* @param errorObjectType object type
*/
public void setErrorObjectType(GenericType errorObjectType) {
this.errorObjectType = errorObjectType;
}
/**
* Get the error object.
*
* @return Error object
*/
public Object getErrorObject() {
return errorObject;
}
/**
* Get the error object.
*
* @param errorObject Error object
*/
public void setErrorObject(Object errorObject) {
this.errorObject = errorObject;
}
} }

10
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@@ -186,14 +186,8 @@ public class AnotherFakeApi {
*/ */
public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null); okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

50
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@@ -319,14 +319,8 @@ public class FakeApi {
*/ */
public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Boolean>(){}.getType();
Type localVarReturnType = new TypeToken<Boolean>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Boolean>(){}.getType()));
e.setErrorObjectType(new GenericType<Boolean>(){});
throw e;
}
} }
/** /**
@@ -454,14 +448,8 @@ public class FakeApi {
*/ */
public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType();
Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<OuterComposite>(){}.getType()));
e.setErrorObjectType(new GenericType<OuterComposite>(){});
throw e;
}
} }
/** /**
@@ -589,14 +577,8 @@ public class FakeApi {
*/ */
public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType();
Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<BigDecimal>(){}.getType()));
e.setErrorObjectType(new GenericType<BigDecimal>(){});
throw e;
}
} }
/** /**
@@ -724,14 +706,8 @@ public class FakeApi {
*/ */
public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**
@@ -1134,14 +1110,8 @@ public class FakeApi {
*/ */
public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null); okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

10
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@@ -186,14 +186,8 @@ public class FakeClassnameTags123Api {
*/ */
public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null); okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

50
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -467,14 +467,8 @@ public class PetApi {
*/ */
public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException { public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null); okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null);
try { Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<List<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<List<Pet>>(){});
throw e;
}
} }
/** /**
@@ -619,14 +613,8 @@ public class PetApi {
@Deprecated @Deprecated
public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws ApiException { public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws ApiException {
okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null); okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null);
try { Type localVarReturnType = new TypeToken<Set<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<Set<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Set<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<Set<Pet>>(){});
throw e;
}
} }
/** /**
@@ -769,14 +757,8 @@ public class PetApi {
*/ */
public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException { public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null); okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null);
try { Type localVarReturnType = new TypeToken<Pet>(){}.getType();
Type localVarReturnType = new TypeToken<Pet>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Pet>(){}.getType()));
e.setErrorObjectType(new GenericType<Pet>(){});
throw e;
}
} }
/** /**
@@ -1215,14 +1197,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException {
okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null); okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**
@@ -1377,14 +1353,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null); okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**

30
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@@ -313,14 +313,8 @@ public class StoreApi {
*/ */
public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException { public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null); okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Map<String, Integer>>(){}.getType()));
e.setErrorObjectType(new GenericType<Map<String, Integer>>(){});
throw e;
}
} }
/** /**
@@ -459,14 +453,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException { public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null); okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**
@@ -604,14 +592,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException { public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null); okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**

20
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/UserApi.java
View File

@@ -719,14 +719,8 @@ public class UserApi {
*/ */
public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException { public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null); okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null);
try { Type localVarReturnType = new TypeToken<User>(){}.getType();
Type localVarReturnType = new TypeToken<User>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<User>(){}.getType()));
e.setErrorObjectType(new GenericType<User>(){});
throw e;
}
} }
/** /**
@@ -874,14 +868,8 @@ public class UserApi {
*/ */
public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException { public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null); okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**

38
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java
View File

@@ -27,8 +27,6 @@ public class ApiException extends Exception {
private int code = 0; private int code = 0;
private Map<String, List<String>> responseHeaders = null; private Map<String, List<String>> responseHeaders = null;
private String responseBody = null; private String responseBody = null;
private Object errorObject = null;
private GenericType errorObjectType = null;
/** /**
* <p>Constructor for ApiException.</p> * <p>Constructor for ApiException.</p>
@@ -155,40 +153,4 @@ public class ApiException extends Exception {
public String getResponseBody() { public String getResponseBody() {
return responseBody; return responseBody;
} }
/**
* Get the error object type.
*
* @return Error object type
*/
public GenericType getErrorObjectType() {
return errorObjectType;
}
/**
* Set the error object type.
*
* @param errorObjectType object type
*/
public void setErrorObjectType(GenericType errorObjectType) {
this.errorObjectType = errorObjectType;
}
/**
* Get the error object.
*
* @return Error object
*/
public Object getErrorObject() {
return errorObject;
}
/**
* Get the error object.
*
* @param errorObject Error object
*/
public void setErrorObject(Object errorObject) {
this.errorObject = errorObject;
}
} }

10
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@@ -175,14 +175,8 @@ public class AnotherFakeApi {
*/ */
public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null); okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

50
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@@ -300,14 +300,8 @@ public class FakeApi {
*/ */
public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Boolean>(){}.getType();
Type localVarReturnType = new TypeToken<Boolean>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Boolean>(){}.getType()));
e.setErrorObjectType(new GenericType<Boolean>(){});
throw e;
}
} }
/** /**
@@ -427,14 +421,8 @@ public class FakeApi {
*/ */
public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType();
Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<OuterComposite>(){}.getType()));
e.setErrorObjectType(new GenericType<OuterComposite>(){});
throw e;
}
} }
/** /**
@@ -554,14 +542,8 @@ public class FakeApi {
*/ */
public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType();
Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<BigDecimal>(){}.getType()));
e.setErrorObjectType(new GenericType<BigDecimal>(){});
throw e;
}
} }
/** /**
@@ -681,14 +663,8 @@ public class FakeApi {
*/ */
public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**
@@ -1070,14 +1046,8 @@ public class FakeApi {
*/ */
public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null); okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

10
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@@ -175,14 +175,8 @@ public class FakeClassnameTags123Api {
*/ */
public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException { public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException {
okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null); okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

50
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -446,14 +446,8 @@ public class PetApi {
*/ */
public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException { public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null); okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null);
try { Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<List<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<List<Pet>>(){});
throw e;
}
} }
/** /**
@@ -593,14 +587,8 @@ public class PetApi {
@Deprecated @Deprecated
public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws ApiException { public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws ApiException {
okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null); okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null);
try { Type localVarReturnType = new TypeToken<Set<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<Set<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Set<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<Set<Pet>>(){});
throw e;
}
} }
/** /**
@@ -735,14 +723,8 @@ public class PetApi {
*/ */
public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException { public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null); okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null);
try { Type localVarReturnType = new TypeToken<Pet>(){}.getType();
Type localVarReturnType = new TypeToken<Pet>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Pet>(){}.getType()));
e.setErrorObjectType(new GenericType<Pet>(){});
throw e;
}
} }
/** /**
@@ -1157,14 +1139,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException {
okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null); okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**
@@ -1311,14 +1287,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null); okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**

30
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@@ -294,14 +294,8 @@ public class StoreApi {
*/ */
public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException { public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null); okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Map<String, Integer>>(){}.getType()));
e.setErrorObjectType(new GenericType<Map<String, Integer>>(){});
throw e;
}
} }
/** /**
@@ -432,14 +426,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException { public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null); okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**
@@ -569,14 +557,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException { public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null); okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**

20
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/UserApi.java
View File

@@ -676,14 +676,8 @@ public class UserApi {
*/ */
public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException { public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null); okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null);
try { Type localVarReturnType = new TypeToken<User>(){}.getType();
Type localVarReturnType = new TypeToken<User>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<User>(){}.getType()));
e.setErrorObjectType(new GenericType<User>(){});
throw e;
}
} }
/** /**
@@ -829,14 +823,8 @@ public class UserApi {
*/ */
public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException { public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null); okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**

38
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java
View File

@@ -27,8 +27,6 @@ public class ApiException extends Exception {
private int code = 0; private int code = 0;
private Map<String, List<String>> responseHeaders = null; private Map<String, List<String>> responseHeaders = null;
private String responseBody = null; private String responseBody = null;
private Object errorObject = null;
private GenericType errorObjectType = null;
/** /**
* <p>Constructor for ApiException.</p> * <p>Constructor for ApiException.</p>
@@ -155,40 +153,4 @@ public class ApiException extends Exception {
public String getResponseBody() { public String getResponseBody() {
return responseBody; return responseBody;
} }
/**
* Get the error object type.
*
* @return Error object type
*/
public GenericType getErrorObjectType() {
return errorObjectType;
}
/**
* Set the error object type.
*
* @param errorObjectType object type
*/
public void setErrorObjectType(GenericType errorObjectType) {
this.errorObjectType = errorObjectType;
}
/**
* Get the error object.
*
* @return Error object
*/
public Object getErrorObject() {
return errorObject;
}
/**
* Get the error object.
*
* @param errorObject Error object
*/
public void setErrorObject(Object errorObject) {
this.errorObject = errorObject;
}
} }

10
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@@ -175,14 +175,8 @@ public class AnotherFakeApi {
*/ */
public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client client) throws ApiException { public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client client) throws ApiException {
okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(client, null); okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(client, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

10
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/DefaultApi.java
View File

@@ -167,14 +167,8 @@ public class DefaultApi {
*/ */
public ApiResponse<InlineResponseDefault> fooGetWithHttpInfo() throws ApiException { public ApiResponse<InlineResponseDefault> fooGetWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = fooGetValidateBeforeCall(null); okhttp3.Call localVarCall = fooGetValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<InlineResponseDefault>(){}.getType();
Type localVarReturnType = new TypeToken<InlineResponseDefault>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<InlineResponseDefault>(){}.getType()));
e.setErrorObjectType(new GenericType<InlineResponseDefault>(){});
throw e;
}
} }
/** /**

70
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@@ -176,14 +176,8 @@ public class FakeApi {
*/ */
public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo() throws ApiException { public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = fakeHealthGetValidateBeforeCall(null); okhttp3.Call localVarCall = fakeHealthGetValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<HealthCheckResult>(){}.getType();
Type localVarReturnType = new TypeToken<HealthCheckResult>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<HealthCheckResult>(){}.getType()));
e.setErrorObjectType(new GenericType<HealthCheckResult>(){});
throw e;
}
} }
/** /**
@@ -302,14 +296,8 @@ public class FakeApi {
*/ */
public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<Boolean>(){}.getType();
Type localVarReturnType = new TypeToken<Boolean>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Boolean>(){}.getType()));
e.setErrorObjectType(new GenericType<Boolean>(){});
throw e;
}
} }
/** /**
@@ -429,14 +417,8 @@ public class FakeApi {
*/ */
public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite) throws ApiException { public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite) throws ApiException {
okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(outerComposite, null); okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(outerComposite, null);
try { Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType();
Type localVarReturnType = new TypeToken<OuterComposite>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<OuterComposite>(){}.getType()));
e.setErrorObjectType(new GenericType<OuterComposite>(){});
throw e;
}
} }
/** /**
@@ -556,14 +538,8 @@ public class FakeApi {
*/ */
public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType();
Type localVarReturnType = new TypeToken<BigDecimal>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<BigDecimal>(){}.getType()));
e.setErrorObjectType(new GenericType<BigDecimal>(){});
throw e;
}
} }
/** /**
@@ -683,14 +659,8 @@ public class FakeApi {
*/ */
public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null); okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**
@@ -807,14 +777,8 @@ public class FakeApi {
*/ */
public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo() throws ApiException { public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = getArrayOfEnumsValidateBeforeCall(null); okhttp3.Call localVarCall = getArrayOfEnumsValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<List<OuterEnum>>(){}.getType();
Type localVarReturnType = new TypeToken<List<OuterEnum>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<List<OuterEnum>>(){}.getType()));
e.setErrorObjectType(new GenericType<List<OuterEnum>>(){});
throw e;
}
} }
/** /**
@@ -1195,14 +1159,8 @@ public class FakeApi {
*/ */
public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws ApiException { public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws ApiException {
okhttp3.Call localVarCall = testClientModelValidateBeforeCall(client, null); okhttp3.Call localVarCall = testClientModelValidateBeforeCall(client, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

10
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@@ -175,14 +175,8 @@ public class FakeClassnameTags123Api {
*/ */
public ApiResponse<Client> testClassnameWithHttpInfo(Client client) throws ApiException { public ApiResponse<Client> testClassnameWithHttpInfo(Client client) throws ApiException {
okhttp3.Call localVarCall = testClassnameValidateBeforeCall(client, null); okhttp3.Call localVarCall = testClassnameValidateBeforeCall(client, null);
try { Type localVarReturnType = new TypeToken<Client>(){}.getType();
Type localVarReturnType = new TypeToken<Client>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Client>(){}.getType()));
e.setErrorObjectType(new GenericType<Client>(){});
throw e;
}
} }
/** /**

50
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -437,14 +437,8 @@ public class PetApi {
*/ */
public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException { public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null); okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null);
try { Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<List<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<List<Pet>>(){});
throw e;
}
} }
/** /**
@@ -584,14 +578,8 @@ public class PetApi {
@Deprecated @Deprecated
public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException { public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null); okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null);
try { Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<List<Pet>>(){}.getType()));
e.setErrorObjectType(new GenericType<List<Pet>>(){});
throw e;
}
} }
/** /**
@@ -726,14 +714,8 @@ public class PetApi {
*/ */
public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException { public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null); okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null);
try { Type localVarReturnType = new TypeToken<Pet>(){}.getType();
Type localVarReturnType = new TypeToken<Pet>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Pet>(){}.getType()));
e.setErrorObjectType(new GenericType<Pet>(){});
throw e;
}
} }
/** /**
@@ -1144,14 +1126,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException {
okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null); okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, _file, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**
@@ -1298,14 +1274,8 @@ public class PetApi {
*/ */
public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null); okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null);
try { Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<ModelApiResponse>(){}.getType()));
e.setErrorObjectType(new GenericType<ModelApiResponse>(){});
throw e;
}
} }
/** /**

30
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@@ -294,14 +294,8 @@ public class StoreApi {
*/ */
public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException { public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null); okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null);
try { Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Map<String, Integer>>(){}.getType()));
e.setErrorObjectType(new GenericType<Map<String, Integer>>(){});
throw e;
}
} }
/** /**
@@ -432,14 +426,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException { public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null); okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**
@@ -569,14 +557,8 @@ public class StoreApi {
*/ */
public ApiResponse<Order> placeOrderWithHttpInfo(Order order) throws ApiException { public ApiResponse<Order> placeOrderWithHttpInfo(Order order) throws ApiException {
okhttp3.Call localVarCall = placeOrderValidateBeforeCall(order, null); okhttp3.Call localVarCall = placeOrderValidateBeforeCall(order, null);
try { Type localVarReturnType = new TypeToken<Order>(){}.getType();
Type localVarReturnType = new TypeToken<Order>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<Order>(){}.getType()));
e.setErrorObjectType(new GenericType<Order>(){});
throw e;
}
} }
/** /**

20
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/UserApi.java
View File

@@ -676,14 +676,8 @@ public class UserApi {
*/ */
public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException { public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null); okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null);
try { Type localVarReturnType = new TypeToken<User>(){}.getType();
Type localVarReturnType = new TypeToken<User>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<User>(){}.getType()));
e.setErrorObjectType(new GenericType<User>(){});
throw e;
}
} }
/** /**
@@ -829,14 +823,8 @@ public class UserApi {
*/ */
public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException { public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null); okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null);
try { Type localVarReturnType = new TypeToken<String>(){}.getType();
Type localVarReturnType = new TypeToken<String>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType);
return localVarApiClient.execute(localVarCall, localVarReturnType);
} catch (ApiException e) {
e.setErrorObject(localVarApiClient.getJSON().getGson().fromJson(e.getResponseBody(), new TypeToken<String>(){}.getType()));
e.setErrorObjectType(new GenericType<String>(){});
throw e;
}
} }
/** /**