Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Java][Okhttp] Add oneOf support (#10875)
* add custom gson deserializer * add check for additional fields, required fields * add tests for custom deserializer * add custom adapter * add custom adapter * register type adapter factory * comment out custom deserializer and use adapter instead * add okhttp-gson-nextgen * add new files * restore okhttp-gson * switch to adapter * remove custom de/serializer * add comment * update tests * test nextgen in ci * update doc * use full model name in JSON.java * undo changes * add oneof discriminator support * fix anyOf * remove mappings * add more tests * fix oneof deserialization, add more tests * add error body and type to api exception class * JSON to use instance variables/methods * Revert "add error body and type to api exception class" This reverts commit 07f34e2.
- Loading branch information
Showing
334 changed files
with
48,332 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| generatorName: java | ||
| outputDir: samples/client/petstore/java/okhttp-gson-nextgen | ||
| library: okhttp-gson-nextgen | ||
| #inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml | ||
| inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml | ||
| templateDir: modules/openapi-generator/src/main/resources/Java | ||
| additionalProperties: | ||
| artifactId: petstore-okhttp-gson-nextgen | ||
| hideGenerationTimestamp: "true" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
...ator/src/main/resources/Java/libraries/okhttp-gson-nextgen/AbstractOpenApiSchema.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| {{>licenseInfo}} | ||
|
|
||
| package {{modelPackage}}; | ||
|
|
||
| import {{invokerPackage}}.ApiException; | ||
| import java.util.Objects; | ||
| import java.lang.reflect.Type; | ||
| import java.util.Map; | ||
| import javax.ws.rs.core.GenericType; | ||
|
|
||
| //import com.fasterxml.jackson.annotation.JsonValue; | ||
|
|
||
| /** | ||
| * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec | ||
| */ | ||
| {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}} | ||
| public abstract class AbstractOpenApiSchema { | ||
| // store the actual instance of the schema/object | ||
| private Object instance; | ||
| // is nullable | ||
| private Boolean isNullable; | ||
| // schema type (e.g. oneOf, anyOf) | ||
| private final String schemaType; | ||
| public AbstractOpenApiSchema(String schemaType, Boolean isNullable) { | ||
| this.schemaType = schemaType; | ||
| this.isNullable = isNullable; | ||
| } | ||
|
|
||
| /** | ||
| * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object | ||
| * | ||
| * @return an instance of the actual schema/object | ||
| */ | ||
| public abstract Map<String, GenericType> getSchemas(); | ||
|
|
||
| /** | ||
| * Get the actual instance | ||
| * | ||
| * @return an instance of the actual schema/object | ||
| */ | ||
| //@JsonValue | ||
| public Object getActualInstance() {return instance;} | ||
|
|
||
| /** | ||
| * Set the actual instance | ||
| * | ||
| * @param instance the actual instance of the schema/object | ||
| */ | ||
| public void setActualInstance(Object instance) {this.instance = instance;} | ||
|
|
||
| /** | ||
| * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well | ||
| * | ||
| * @return an instance of the actual schema/object | ||
| */ | ||
| public Object getActualInstanceRecursively() { | ||
| return getActualInstanceRecursively(this); | ||
| } | ||
|
|
||
| private Object getActualInstanceRecursively(AbstractOpenApiSchema object) { | ||
| if (object.getActualInstance() == null) { | ||
| return null; | ||
| } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) { | ||
| return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance()); | ||
| } else { | ||
| return object.getActualInstance(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get the schema type (e.g. anyOf, oneOf) | ||
| * | ||
| * @return the schema type | ||
| */ | ||
| public String getSchemaType() { | ||
| return schemaType; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("class ").append(getClass()).append(" {\n"); | ||
| sb.append(" instance: ").append(toIndentedString(instance)).append("\n"); | ||
| sb.append(" isNullable: ").append(toIndentedString(isNullable)).append("\n"); | ||
| sb.append(" schemaType: ").append(toIndentedString(schemaType)).append("\n"); | ||
| sb.append("}"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given object to string with each line indented by 4 spaces | ||
| * (except the first line). | ||
| */ | ||
| private String toIndentedString(Object o) { | ||
| if (o == null) { | ||
| return "null"; | ||
| } | ||
| return o.toString().replace("\n", "\n "); | ||
| } | ||
|
|
||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| AbstractOpenApiSchema a = (AbstractOpenApiSchema) o; | ||
| return Objects.equals(this.instance, a.instance) && | ||
| Objects.equals(this.isNullable, a.isNullable) && | ||
| Objects.equals(this.schemaType, a.schemaType); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(instance, isNullable, schemaType); | ||
| } | ||
|
|
||
| /** | ||
| * Is nullable | ||
| * | ||
| * @return true if it's nullable | ||
| */ | ||
| public Boolean isNullable() { | ||
| if (Boolean.TRUE.equals(isNullable)) { | ||
| return Boolean.TRUE; | ||
| } else { | ||
| return Boolean.FALSE; | ||
| } | ||
| } | ||
|
|
||
| {{>libraries/jersey2/additional_properties}} | ||
|
|
||
| } |
51 changes: 51 additions & 0 deletions
51
...napi-generator/src/main/resources/Java/libraries/okhttp-gson-nextgen/ApiCallback.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| {{>licenseInfo}} | ||
|
|
||
| package {{invokerPackage}}; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Callback for asynchronous API call. | ||
| * | ||
| * @param <T> The return type | ||
| */ | ||
| public interface ApiCallback<T> { | ||
| /** | ||
| * This is called when the API call fails. | ||
| * | ||
| * @param e The exception causing the failure | ||
| * @param statusCode Status code of the response if available, otherwise it would be 0 | ||
| * @param responseHeaders Headers of the response if available, otherwise it would be null | ||
| */ | ||
| void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders); | ||
| /** | ||
| * This is called when the API call succeeded. | ||
| * | ||
| * @param result The result deserialized from response | ||
| * @param statusCode Status code of the response | ||
| * @param responseHeaders Headers of the response | ||
| */ | ||
| void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders); | ||
| /** | ||
| * This is called when the API upload processing. | ||
| * | ||
| * @param bytesWritten bytes Written | ||
| * @param contentLength content length of request body | ||
| * @param done write end | ||
| */ | ||
| void onUploadProgress(long bytesWritten, long contentLength, boolean done); | ||
| /** | ||
| * This is called when the API download processing. | ||
| * | ||
| * @param bytesRead bytes Read | ||
| * @param contentLength content length of the response | ||
| * @param done Read end | ||
| */ | ||
| void onDownloadProgress(long bytesRead, long contentLength, boolean done); | ||
| } |
Oops, something went wrong.