loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-05 14:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for regression in issue: https://github.com/swagger-api/swagger-codegen/issues/6472 (#6480)

Browse Source
This commit is contained in:
Jean-François Côté
2017-10-09 10:51:32 -04:00
committed by wing328
parent e90a40bfce
commit e6d4362012
7 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
View File

@@ -656,7 +656,16 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
return null;
}
return String.format(pattern, getTypeDeclaration(ap.getItems()));
String typeDeclaration = getTypeDeclaration(ap.getItems());
Object java8obj = additionalProperties.get("java8");
if (java8obj != null) {
Boolean java8 = Boolean.valueOf(java8obj.toString());
if (java8 != null && java8) {
typeDeclaration = "";
}
}
return String.format(pattern, typeDeclaration);
} else if (p instanceof MapProperty) {
final MapProperty ap = (MapProperty) p;
final String pattern;
@@ -669,7 +678,16 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
return null;
}
return String.format(pattern, String.format("String, %s", getTypeDeclaration(ap.getAdditionalProperties())));
String typeDeclaration = String.format("String, %s", getTypeDeclaration(ap.getAdditionalProperties()));
Object java8obj = additionalProperties.get("java8");
if (java8obj != null) {
Boolean java8 = Boolean.valueOf(java8obj.toString());
if (java8 != null && java8) {
typeDeclaration = "";
}
}
return String.format(pattern, typeDeclaration);
} else if (p instanceof IntegerProperty) {
IntegerProperty dp = (IntegerProperty) p;
if (dp.getDefault() != null) {

4
samples/server/petstore/java-play-framework-controller-only/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],

4
samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],

4
samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],

4
samples/server/petstore/java-play-framework-no-interface/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],

4
samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],

4
samples/server/petstore/java-play-framework/public/swagger.json
View File

@@ -112,8 +112,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],