Skip to content

[WIP] Fix allOf in inline model resolver#1841

Closed
wing328 wants to merge 2 commits intomasterfrom
improve_flatten
Closed

[WIP] Fix allOf in inline model resolver#1841
wing328 wants to merge 2 commits intomasterfrom
improve_flatten

Conversation

@wing328
Copy link
Member

@wing328 wing328 commented Jan 8, 2019

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Found this bug while working on better allOf, anyOf, oneOf support: model instanceof Schema should be the last check, otherwise all other checks (eg.. ArraySchema) will be skipped.

Also deprecating fixStringModel as we shouldn't need it to remove double quote in enum example value

cc @OpenAPITools/generator-core-team

@wing328 wing328 added this to the 4.0.0 milestone Jan 8, 2019
@wing328 wing328 changed the title Fix allOf in inline model resolver [WIP] Fix allOf in inline model resolver Jan 8, 2019
Schema m = (Schema) model;
Map<String, Schema> properties = m.getProperties();
flattenProperties(properties, modelName);
//fixStringModel(m);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this commented?


for (Schema component : schemaList) {
if (component.get$ref() == null) {
flattenProperties(component.getProperties(), resolveModelName(component.getTitle(), "composed_" + modelName));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any plan to make component_ configurable here?

@wing328 wing328 modified the milestones: 4.0.0, 4.0.1 May 13, 2019
@wing328 wing328 modified the milestones: 4.0.1, 4.0.2 May 31, 2019
@wing328 wing328 modified the milestones: 4.0.2, 4.0.3 Jun 20, 2019
@wing328 wing328 modified the milestones: 4.0.3, 4.1.0 Jul 9, 2019
@wing328 wing328 modified the milestones: 4.1.0, 4.1.1 Aug 9, 2019
@wing328 wing328 modified the milestones: 4.1.1, 4.1.2 Aug 26, 2019
@wing328 wing328 modified the milestones: 4.1.2, 4.1.3 Sep 11, 2019
@wing328 wing328 modified the milestones: 4.1.3, 4.2.0 Oct 4, 2019
@wing328 wing328 removed this from the 4.2.0 milestone Oct 30, 2019
@wing328
Copy link
Member Author

wing328 commented Nov 12, 2019

Not ready to be merged. Will open a new one if needed.

@wing328 wing328 closed this Nov 12, 2019
@wing328 wing328 deleted the improve_flatten branch November 12, 2019 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants