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 "flattenParameters" to reduce the scope of method
  • Loading branch information
@ackintosh
ackintosh committed Jan 1, 2019
commit 3c68d49b59bfdb462baab550ab9d9b380ce758cf
101 changes: 57 additions & 44 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 @@ -73,51 +73,8 @@ private void flattenPaths(OpenAPI openAPI) {
PathItem path = paths.get(pathname);
for (Operation operation : path.readOperations()) {
flattenRequestBody(openAPI, pathname, operation);
flattenParameters(openAPI, pathname, operation);

List<Parameter> parameters = operation.getParameters();
if (parameters != null) {
for (Parameter parameter : parameters) {
if (parameter.getSchema() != null) {
Schema model = parameter.getSchema();
if (model instanceof ObjectSchema) {
Schema obj = (Schema) model;
if (obj.getType() == null || "object".equals(obj.getType())) {
if (obj.getProperties() != null && obj.getProperties().size() > 0) {
flattenProperties(obj.getProperties(), pathname);
String modelName = resolveModelName(obj.getTitle(), parameter.getName());

parameter.$ref(modelName);
addGenerated(modelName, model);
openAPI.getComponents().addSchemas(modelName, model);
}
}
} else if (model instanceof ArraySchema) {
ArraySchema am = (ArraySchema) model;
Schema inner = am.getItems();
if (inner instanceof ObjectSchema) {
ObjectSchema op = (ObjectSchema) inner;
if (op.getProperties() != null && op.getProperties().size() > 0) {
flattenProperties(op.getProperties(), pathname);
String modelName = resolveModelName(op.getTitle(), parameter.getName());
Schema innerModel = modelFromProperty(op, modelName);
String existing = matchGenerated(innerModel);
if (existing != null) {
Schema schema = new Schema().$ref(existing);
schema.setRequired(op.getRequired());
am.setItems(schema);
} else {
Schema schema = new Schema().$ref(modelName);
schema.setRequired(op.getRequired());
am.setItems(schema);
addGenerated(modelName, innerModel);
openAPI.getComponents().addSchemas(modelName, innerModel);
}
}
}
}
}
}
}
Map<String, ApiResponse> responses = operation.getResponses();
if (responses != null) {
for (String key : responses.keySet()) {
Expand Down Expand Up @@ -289,6 +246,62 @@ private void flattenRequestBody(OpenAPI openAPI, String pathname, Operation oper
}
}

/**
* Flatten inline models in parameters
*
* @param openAPI target spec
* @param pathname target pathname
* @param operation target operation
*/
private void flattenParameters(OpenAPI openAPI, String pathname, Operation operation) {
List<Parameter> parameters = operation.getParameters();
if (parameters == null) {
return;
}

for (Parameter parameter : parameters) {
if (parameter.getSchema() != null) {
Schema model = parameter.getSchema();
if (model instanceof ObjectSchema) {
Schema obj = (Schema) model;
if (obj.getType() == null || "object".equals(obj.getType())) {
if (obj.getProperties() != null && obj.getProperties().size() > 0) {
flattenProperties(obj.getProperties(), pathname);
String modelName = resolveModelName(obj.getTitle(), parameter.getName());

parameter.$ref(modelName);
addGenerated(modelName, model);
openAPI.getComponents().addSchemas(modelName, model);
}
}
} else if (model instanceof ArraySchema) {
ArraySchema am = (ArraySchema) model;
Schema inner = am.getItems();
if (inner instanceof ObjectSchema) {
ObjectSchema op = (ObjectSchema) inner;
if (op.getProperties() != null && op.getProperties().size() > 0) {
flattenProperties(op.getProperties(), pathname);
String modelName = resolveModelName(op.getTitle(), parameter.getName());
Schema innerModel = modelFromProperty(op, modelName);
String existing = matchGenerated(innerModel);
if (existing != null) {
Schema schema = new Schema().$ref(existing);
schema.setRequired(op.getRequired());
am.setItems(schema);
} else {
Schema schema = new Schema().$ref(modelName);
schema.setRequired(op.getRequired());
am.setItems(schema);
addGenerated(modelName, innerModel);
openAPI.getComponents().addSchemas(modelName, innerModel);
}
}
}
}
}
}
}

/**
* Flatten inline models in components
*
Expand Down