Skip to content

Commit

Permalink
swagger-api#10125 fix DefaultCodegen parsing to handle 'uniqueItems' …
Browse files Browse the repository at this point in the history
…flag
  • Loading branch information
akshpan committed Apr 5, 2020
1 parent 784ec6a commit 79302db
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class CodegenProperty implements Cloneable {
public String enumName;
public Integer maxItems;
public Integer minItems;
public boolean uniqueItems;

// XML
public boolean isXmlAttribute = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,7 @@ public CodegenProperty fromProperty(String name, Property p) {
ArrayProperty ap = (ArrayProperty) p;
property.maxItems = ap.getMaxItems();
property.minItems = ap.getMinItems();
property.uniqueItems = ap.getUniqueItems() == null ? false : ap.getUniqueItems();
String itemName = (String) p.getVendorExtensions().get("x-item-name");
if (itemName == null) {
itemName = property.name;
Expand Down Expand Up @@ -2710,6 +2711,7 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
p.isPrimitiveType = cp.isPrimitiveType;
p.isContainer = true;
p.isListContainer = true;
p.uniqueItems = impl.getUniqueItems() == null ? false : impl.getUniqueItems();

// set boolean flag (e.g. isString)
setParameterBooleanFlagWithCodegenProperty(p, cp);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.bash
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.circleci
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.circleci.java7
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.ios
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.jenkins.java7
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.travis
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@
</repository>
</repositories>
<properties>
<swagger-parser-version>1.0.50</swagger-parser-version>
<swagger-parser-version>1.0.51</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>1.6.1</swagger-core-version>
Expand Down

0 comments on commit 79302db

Please sign in to comment.