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

fix inline schema without object type (#5992)

Browse Source
This commit is contained in:
William Cheng 2020-04-21 15:39:40 +08:00 committed by GitHub
parent da149e1204
commit f8911700c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
View File

@ -332,11 +332,11 @@ public class InlineModelResolver {
* Flattens properties of inline object schemas that belong to a composed schema into a * Flattens properties of inline object schemas that belong to a composed schema into a
* single flat list of properties. This is useful to generate a single or multiple * single flat list of properties. This is useful to generate a single or multiple
* inheritance model. * inheritance model.
* *
* In the example below, codegen may generate a 'Dog' class that extends from the * In the example below, codegen may generate a 'Dog' class that extends from the
* generated 'Animal' class. 'Dog' has additional properties 'name', 'age' and 'breed' that * generated 'Animal' class. 'Dog' has additional properties 'name', 'age' and 'breed' that
* are flattened as a single list of properties. * are flattened as a single list of properties.
* *
* Dog: * Dog:
* allOf: * allOf:
* - $ref: '#/components/schemas/Animal' * - $ref: '#/components/schemas/Animal'
@ -350,7 +350,7 @@ public class InlineModelResolver {
* properties: * properties:
* breed: * breed:
* type: string * type: string
* *
* @param openAPI the OpenAPI document * @param openAPI the OpenAPI document
* @param key a unique name ofr the composed schema. * @param key a unique name ofr the composed schema.
* @param children the list of nested schemas within a composed schema (allOf, anyOf, oneOf). * @param children the list of nested schemas within a composed schema (allOf, anyOf, oneOf).
@ -362,8 +362,10 @@ public class InlineModelResolver {
ListIterator<Schema> listIterator = children.listIterator(); ListIterator<Schema> listIterator = children.listIterator();
while (listIterator.hasNext()) { while (listIterator.hasNext()) {
Schema component = listIterator.next(); Schema component = listIterator.next();
if (component instanceof ObjectSchema) { if (component instanceof ObjectSchema || // for inline schema with type:object
ObjectSchema op = (ObjectSchema) component; (component != null && component.getProperties() != null &&
!component.getProperties().isEmpty())) { // for inline schema without type:object
Schema op = component;
if (op.get$ref() == null && op.getProperties() != null && op.getProperties().size() > 0) { if (op.get$ref() == null && op.getProperties() != null && op.getProperties().size() > 0) {
// If a `title` attribute is defined in the inline schema, codegen uses it to name the // If a `title` attribute is defined in the inline schema, codegen uses it to name the
// inline schema. Otherwise, we'll use the default naming such as InlineObject1, etc. // inline schema. Otherwise, we'll use the default naming such as InlineObject1, etc.
@ -390,6 +392,8 @@ public class InlineModelResolver {
listIterator.set(schema); listIterator.set(schema);
} }
} }
} else {
// likely a reference to schema (not inline schema)
} }
} }
} }
@ -465,7 +469,7 @@ public class InlineModelResolver {
* with underscores * with underscores
* *
* e.g. io.schema.User_name => io_schema_User_name * e.g. io.schema.User_name => io_schema_User_name
* *
* @param title String title field in the schema if present * @param title String title field in the schema if present
* @param key String model name * @param key String model name
* *
@ -607,7 +611,7 @@ public class InlineModelResolver {
} }
} }
private Schema modelFromProperty(ObjectSchema object, String path) { private Schema modelFromProperty(Schema object, String path) {
String description = object.getDescription(); String description = object.getDescription();
String example = null; String example = null;
Object obj = object.getExample(); Object obj = object.getExample();