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

add null type support to oneof/anyof java jersey2 (#6269)

Browse Source
This commit is contained in:
William Cheng
2020-05-13 00:46:53 +08:00
committed by GitHub
parent a77e038cb3
commit f8be3926f4
11 changed files with 150 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
View File

@@ -606,7 +606,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
HashMap<String, Object> h = (HashMap<String, Object>) o;
CodegenModel m = (CodegenModel) h.get("model");
modelMaps.put(m.classname, m);
}
// check if return type is oneOf/anyeOf model
@@ -809,6 +808,18 @@ public class JavaClientCodegen extends AbstractJavaCodegen
//List<String> impl = (List<String>) cm.getVendorExtensions().get("x-implements");
if (JERSEY2.equals(getLibrary())) {
cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
if (cm.oneOf != null && !cm.oneOf.isEmpty() && cm.oneOf.contains("ModelNull")) {
// if oneOf contains "null" type
cm.isNullable = true;
cm.oneOf.remove("ModelNull");
}
if (cm.anyOf != null && !cm.anyOf.isEmpty() && cm.anyOf.contains("ModelNull")) {
// if anyOf contains "null" type
cm.isNullable = true;
cm.anyOf.remove("ModelNull");
}
}
if (this.parcelableModel) {
((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");

19
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache vendored
View File

@@ -16,11 +16,15 @@ 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) {
public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
this.schemaType = schemaType;
this.isNullable = isNullable;
}
/***
@@ -52,4 +56,17 @@ public abstract class AbstractOpenApiSchema {
public String getSchemaType() {
return schemaType;
}
/***
* Is nullalble
*
* @return true if it's nullable
*/
public Boolean isNullable() {
if (Boolean.TRUE.equals(isNullable)) {
return Boolean.TRUE;
} else {
return Boolean.FALSE;
}
}
}

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

@@ -848,6 +848,15 @@ public class ApiClient {
int matchCounter = 0;
ArrayList<String> matchSchemas = new ArrayList<>();
if (schema.isNullable()) {
response.bufferEntity();
if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
"".equals(String.valueOf(response.readEntity(String.class)))) {
// schema is nullable and the response body is {} or empty string
return schema;
}
}
for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
String schemaName = entry.getKey();
GenericType schemaType = entry.getValue();

21
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache vendored
View File

@@ -11,7 +11,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
public {{classname}}() {
super("anyOf");
super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
}
static {
@@ -25,4 +25,23 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
public Map<String, GenericType> getSchemas() {
return {{classname}}.schemas;
}
@Override
public void setActualInstance(Object instance) {
{{#isNulalble}}
if (instance == null) {
super.setActualInstance(instance);
return;
}
{{/isNulalble}}
{{#anyOf}}
if (instance instanceof {{{.}}}) {
super.setActualInstance(instance);
return;
}
{{/anyOf}}
throw new RuntimeException("Invalid instance type. Must be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}");
}
}

11
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache vendored
View File

@@ -11,7 +11,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
public {{classname}}() {
super("oneOf");
super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
}
static {
@@ -28,6 +28,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
@Override
public void setActualInstance(Object instance) {
{{#isNulalble}}
if (instance == null) {
super.setActualInstance(instance);
return;
}
{{/isNulalble}}
{{#oneOf}}
if (instance instanceof {{{.}}}) {
super.setActualInstance(instance);
@@ -38,4 +45,6 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
throw new RuntimeException("Invalid instance type. Must be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}");
}
}

9
samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -760,6 +760,15 @@ public class ApiClient {
int matchCounter = 0;
ArrayList<String> matchSchemas = new ArrayList<>();
if (schema.isNullable()) {
response.bufferEntity();
if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
"".equals(String.valueOf(response.readEntity(String.class)))) {
// schema is nullable and the response body is {} or empty string
return schema;
}
}
for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
String schemaName = entry.getKey();
GenericType schemaType = entry.getValue();

19
samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@@ -27,11 +27,15 @@ 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) {
public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
this.schemaType = schemaType;
this.isNullable = isNullable;
}
/***
@@ -63,4 +67,17 @@ public abstract class AbstractOpenApiSchema {
public String getSchemaType() {
return schemaType;
}
/***
* Is nullalble
*
* @return true if it's nullable
*/
public Boolean isNullable() {
if (Boolean.TRUE.equals(isNullable)) {
return Boolean.TRUE;
} else {
return Boolean.FALSE;
}
}
}

9
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -761,6 +761,15 @@ public class ApiClient {
int matchCounter = 0;
ArrayList<String> matchSchemas = new ArrayList<>();
if (schema.isNullable()) {
response.bufferEntity();
if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
"".equals(String.valueOf(response.readEntity(String.class)))) {
// schema is nullable and the response body is {} or empty string
return schema;
}
}
for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
String schemaName = entry.getKey();
GenericType schemaType = entry.getValue();

19
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@@ -27,11 +27,15 @@ 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) {
public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
this.schemaType = schemaType;
this.isNullable = isNullable;
}
/***
@@ -63,4 +67,17 @@ public abstract class AbstractOpenApiSchema {
public String getSchemaType() {
return schemaType;
}
/***
* Is nullalble
*
* @return true if it's nullable
*/
public Boolean isNullable() {
if (Boolean.TRUE.equals(isNullable)) {
return Boolean.TRUE;
} else {
return Boolean.FALSE;
}
}
}

9
samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -761,6 +761,15 @@ public class ApiClient {
int matchCounter = 0;
ArrayList<String> matchSchemas = new ArrayList<>();
if (schema.isNullable()) {
response.bufferEntity();
if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
"".equals(String.valueOf(response.readEntity(String.class)))) {
// schema is nullable and the response body is {} or empty string
return schema;
}
}
for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
String schemaName = entry.getKey();
GenericType schemaType = entry.getValue();

19
samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@@ -27,11 +27,15 @@ 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) {
public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
this.schemaType = schemaType;
this.isNullable = isNullable;
}
/***
@@ -63,4 +67,17 @@ public abstract class AbstractOpenApiSchema {
public String getSchemaType() {
return schemaType;
}
/***
* Is nullalble
*
* @return true if it's nullable
*/
public Boolean isNullable() {
if (Boolean.TRUE.equals(isNullable)) {
return Boolean.TRUE;
} else {
return Boolean.FALSE;
}
}
}