Skip to content

Commit 66de203

Browse files
authored
Merge pull request #10549 from swagger-api/issue-7058
updated parser version and required porperty from composed model
2 parents 27f0e1f + 914ab7e commit 66de203

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
293293
}
294294

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

1503+
if (composed.getRequired() != null) {
1504+
required.addAll(composed.getRequired());
1505+
}
1506+
15031507
// child model (properties owned by the model itself)
15041508
Model child = composed.getChild();
15051509
if (child != null && child instanceof RefModel && allDefinitions != null) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@
940940
</repository>
941941
</repositories>
942942
<properties>
943-
<swagger-parser-version>1.0.52</swagger-parser-version>
943+
<swagger-parser-version>1.0.53-SNAPSHOT</swagger-parser-version>
944944
<scala-version>2.11.1</scala-version>
945945
<felix-version>3.3.0</felix-version>
946946
<swagger-core-version>1.6.2</swagger-core-version>

0 commit comments

Comments
 (0)