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

Fix default value generation for composed schemas in AbstractJavaCodegen (#8918)

Browse Source
This commit is contained in:
Florian Kamella 2021-03-23 17:36:54 +01:00 committed by GitHub
parent 0f981fffc3
commit 03be3c612d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -941,6 +941,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
return super.toDefaultValue(schema); return super.toDefaultValue(schema);
} }
return null; return null;
} else if (ModelUtils.isComposedSchema(schema)) {
if (schema.getDefault() != null) {
return super.toDefaultValue(schema);
}
return null;
} }
return super.toDefaultValue(schema); return super.toDefaultValue(schema);

6
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
View File

@ -53,13 +53,13 @@ import org.openapitools.client.JSON;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Drawing { public class Drawing {
public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape"; public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape";
private Shape mainShape = null; private Shape mainShape;
public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull"; public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull";
private ShapeOrNull shapeOrNull = null; private ShapeOrNull shapeOrNull;
public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape"; public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape";
private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>of(null); private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>undefined();
public static final String JSON_PROPERTY_SHAPES = "shapes"; public static final String JSON_PROPERTY_SHAPES = "shapes";
private List<Shape> shapes = null; private List<Shape> shapes = null;

6
samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java
View File

@ -54,13 +54,13 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") @javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Drawing extends HashMap<String, Fruit> { public class Drawing extends HashMap<String, Fruit> {
public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape"; public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape";
private Shape mainShape = null; private Shape mainShape;
public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull"; public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull";
private ShapeOrNull shapeOrNull = null; private ShapeOrNull shapeOrNull;
public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape"; public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape";
private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>of(null); private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>undefined();
public static final String JSON_PROPERTY_SHAPES = "shapes"; public static final String JSON_PROPERTY_SHAPES = "shapes";
private List<Shape> shapes = null; private List<Shape> shapes = null;