Skip to content
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

Jump to bottom

updated parser version and required porperty from composed model #10549

Merged
merged 2 commits into from
Nov 8, 2020
Merged

updated parser version and required porperty from composed model #10549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e33875
updated parser version and required porperty from composed model
HugoMario Nov 8, 2020
914ab7e
created dummy commit to restart CI processes.
HugoMario Nov 8, 2020
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
8 changes: 6 additions & 2 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
}

/**
* Returns the common prefix of variables for enum naming if
* two or more variables are present
* Returns the common prefix of variables for enum naming if
* two or more variables are present.
*
* @param vars List of variable names
* @return the common prefix for naming
Expand Down Expand Up @@ -1500,6 +1500,10 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
properties.putAll(model.getProperties());
}

if (composed.getRequired() != null) {
required.addAll(composed.getRequired());
}

// child model (properties owned by the model itself)
Model child = composed.getChild();
if (child != null && child instanceof RefModel && allDefinitions != null) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.52</swagger-parser-version>
<swagger-parser-version>1.0.53-SNAPSHOT</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.2</swagger-core-version>
Expand Down