Skip to content

Refactor InlineModelResolver #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 14 commits into from
Jan 2, 2019
Merged

Refactor InlineModelResolver #1788

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e72883c
Extract a method "flattenPaths" to reduce the scope of method
ackintosh Jan 1, 2019
44a91ae
Tweak
ackintosh Jan 1, 2019
c0adf93
Rename parameter name
ackintosh Jan 1, 2019
2a94804
Extract a method "flattenModels" to reduce the scope of method
ackintosh Jan 1, 2019
4a4cc9c
Rename parameter name
ackintosh Jan 1, 2019
b2ee6fc
Rename: models -> components
ackintosh Jan 1, 2019
0454af2
Delete comment
ackintosh Jan 1, 2019
07de784
Merge branch 'master' into refactor-inline-model-resolver
ackintosh Jan 1, 2019
5b025f4
Extract a method "flattenRequestBody" to reduce the scope of method
ackintosh Jan 1, 2019
3c68d49
Extract a method "flattenParameters" to reduce the scope of method
ackintosh Jan 1, 2019
0647c1e
Extract a method "flattenResponses" to reduce the scope of method
ackintosh Jan 1, 2019
a611c50
Tweak types
ackintosh Jan 1, 2019
061d928
Reduce indentation
ackintosh Jan 1, 2019
271562f
Merge branch 'master' into refactor-inline-model-resolver
ackintosh Jan 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract a method "flattenModels" to reduce the scope of method
  • Loading branch information
@ackintosh
ackintosh committed Jan 1, 2019
commit 2a94804fdc417ca5e0ac6c548d535d4f58c3ec5b
109 changes: 60 additions & 49 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,57 +55,9 @@ void flatten(OpenAPI openapi) {
}
// operations
flattenPaths(openapi);
Map<String, Schema> models = openapi.getComponents().getSchemas();

// definitions
if (models != null) {
List<String> modelNames = new ArrayList<String>(models.keySet());
for (String modelName : modelNames) {
Schema model = models.get(modelName);
if (model instanceof Schema) {
Schema m = (Schema) model;
Map<String, Schema> properties = m.getProperties();
flattenProperties(properties, modelName);
fixStringModel(m);
} else if (ModelUtils.isArraySchema(model)) {
ArraySchema m = (ArraySchema) model;
Schema inner = m.getItems();
if (inner instanceof ObjectSchema) {
ObjectSchema op = (ObjectSchema) inner;
if (op.getProperties() != null && op.getProperties().size() > 0) {
String innerModelName = resolveModelName(op.getTitle(), modelName + "_inner");
Schema innerModel = modelFromProperty(op, innerModelName);
String existing = matchGenerated(innerModel);
if (existing == null) {
openapi.getComponents().addSchemas(innerModelName, innerModel);
addGenerated(innerModelName, innerModel);
Schema schema = new Schema().$ref(innerModelName);
schema.setRequired(op.getRequired());
m.setItems(schema);
} else {
Schema schema = new Schema().$ref(existing);
schema.setRequired(op.getRequired());
m.setItems(schema);
}
}
}
} else if (ModelUtils.isComposedSchema(model)) {
ComposedSchema m = (ComposedSchema) model;
if (m.getAllOf() != null && !m.getAllOf().isEmpty()) {
Schema child = null;
for (Schema component : m.getAllOf()) {
if (component.get$ref() == null) {
child = component;
}
}
if (child != null) {
Map<String, Schema> properties = child.getProperties();
flattenProperties(properties, modelName);
}
}
}
}
}
flattenModels(openapi);
}

/**
Expand Down Expand Up @@ -326,6 +278,65 @@ private void flattenPaths(OpenAPI openAPI) {
}
}

/**
* Flatten inline models in models
*
* @param openapi target spec
*/
private void flattenModels(OpenAPI openapi) {
Map<String, Schema> models = openapi.getComponents().getSchemas();
if (models == null) {
return;
}

List<String> modelNames = new ArrayList<String>(models.keySet());
for (String modelName : modelNames) {
Schema model = models.get(modelName);
if (model instanceof Schema) {
Schema m = (Schema) model;
Map<String, Schema> properties = m.getProperties();
flattenProperties(properties, modelName);
fixStringModel(m);
} else if (ModelUtils.isArraySchema(model)) {
ArraySchema m = (ArraySchema) model;
Schema inner = m.getItems();
if (inner instanceof ObjectSchema) {
ObjectSchema op = (ObjectSchema) inner;
if (op.getProperties() != null && op.getProperties().size() > 0) {
String innerModelName = resolveModelName(op.getTitle(), modelName + "_inner");
Schema innerModel = modelFromProperty(op, innerModelName);
String existing = matchGenerated(innerModel);
if (existing == null) {
openapi.getComponents().addSchemas(innerModelName, innerModel);
addGenerated(innerModelName, innerModel);
Schema schema = new Schema().$ref(innerModelName);
schema.setRequired(op.getRequired());
m.setItems(schema);
} else {
Schema schema = new Schema().$ref(existing);
schema.setRequired(op.getRequired());
m.setItems(schema);
}
}
}
} else if (ModelUtils.isComposedSchema(model)) {
ComposedSchema m = (ComposedSchema) model;
if (m.getAllOf() != null && !m.getAllOf().isEmpty()) {
Schema child = null;
for (Schema component : m.getAllOf()) {
if (component.get$ref() == null) {
child = component;
}
}
if (child != null) {
Map<String, Schema> properties = child.getProperties();
flattenProperties(properties, modelName);
}
}
}
}
}

/**
* This function fix models that are string (mostly enum). Before this fix, the
* example would look something like that in the doc: "\"example from def\""
Expand Down