Skip to content

Add an option to generate the alias (map, array) as model #1729

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 4 commits into from
Dec 31, 2018
Merged

Add an option to generate the alias (map, array) as model #1729

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02536bc
add option to generate alias as model
wing328 Dec 21, 2018
2dbe899
Merge remote-tracking branch 'origin/master' into option_generate_ali…
wing328 Dec 26, 2018
cd13337
fix issue due to incorrect merge
wing328 Dec 26, 2018
f29d04b
Merge branch 'master' into option_generate_alias_model
wing328 Dec 31, 2018
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
fix issue due to incorrect merge
  • Loading branch information
@wing328
wing328 committed Dec 26, 2018
commit cd133378a016a5626e6d1d67673c3a17edd07fc1
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,13 @@ private Model getParent(Model model) {
LOGGER.info("Model " + name + " not generated since it's a free-form object");
continue;
} else if (ModelUtils.isMapSchema(schema)) { // check to see if it's a "map" model
if (!ModelUtils.isGenerateAliasAsModel() && schema.getProperties() == null || schema.getProperties().isEmpty()) {
if (!ModelUtils.isGenerateAliasAsModel() && (schema.getProperties() == null || schema.getProperties().isEmpty())) {
// schema without property, i.e. alias to map
LOGGER.info("Model " + name + " not generated since it's an alias to map (without property)");
continue;
}
} else if (ModelUtils.isArraySchema(schema)) { // check to see if it's an "array" model
if (!ModelUtils.isGenerateAliasAsModel() && schema.getProperties() == null || schema.getProperties().isEmpty()) {
if (!ModelUtils.isGenerateAliasAsModel() && (schema.getProperties() == null || schema.getProperties().isEmpty())) {
// schema without property, i.e. alias to array
LOGGER.info("Model " + name + " not generated since it's an alias to array (without property)");
continue;
Expand Down