From 57762cc250c6e062654118517e52bc14c7951021 Mon Sep 17 00:00:00 2001 From: Guillermo Pastor Diez Date: Tue, 3 Oct 2017 16:32:18 +0200 Subject: [PATCH 1/2] feat: java.util.UUID if parameter is UUID --- .../io/swagger/codegen/DefaultCodegen.java | 138 +++++++++--------- .../JavaPlayFramework/routes.mustache | 18 +-- 2 files changed, 77 insertions(+), 79 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 6ebda3dccc5..56c7bb35b92 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -207,7 +207,7 @@ public Map postProcessAllModels(Map objs) { // TODO Determine what to do if the parent discriminator name == the grandparent discriminator name while (parent != null) { if (parent.children == null) { - parent.children = new ArrayList(); + parent.children = new ArrayList(); } parent.children.add(cm); if (parent.discriminator == null) { @@ -993,7 +993,7 @@ public String toInstantiationType(Property p) { String type = additionalProperties2.getType(); if (null == type) { LOGGER.error("No Type defined for Additional Property " + additionalProperties2 + "\n" // - + "\tIn Property: " + p); + + "\tIn Property: " + p); } String inner = getSwaggerType(additionalProperties2); return instantiationTypes.get("map") + ""; @@ -1334,13 +1334,13 @@ public CodegenModel fromModel(String name, Model model, Map allDe m.isAlias = typeAliases.containsKey(name); if (model instanceof ModelImpl) { - ModelImpl modelImpl = (ModelImpl) model; + ModelImpl modelImpl = (ModelImpl) model; m.discriminator = modelImpl.getDiscriminator(); if (modelImpl.getXml() != null) { - m.xmlPrefix = modelImpl.getXml().getPrefix(); - m.xmlNamespace = modelImpl.getXml().getNamespace(); - m.xmlName = modelImpl.getXml().getName(); + m.xmlPrefix = modelImpl.getXml().getPrefix(); + m.xmlNamespace = modelImpl.getXml().getNamespace(); + m.xmlName = modelImpl.getXml().getName(); } } @@ -1365,14 +1365,14 @@ public CodegenModel fromModel(String name, Model model, Map allDe int modelImplCnt = 0; // only one inline object allowed in a ComposedModel for (Model innerModel: ((ComposedModel)model).getAllOf()) { if (innerModel instanceof ModelImpl) { - ModelImpl modelImpl = (ModelImpl) innerModel; + ModelImpl modelImpl = (ModelImpl) innerModel; if (m.discriminator == null) { m.discriminator = modelImpl.getDiscriminator(); } if (modelImpl.getXml() != null) { - m.xmlPrefix = modelImpl.getXml().getPrefix(); - m.xmlNamespace = modelImpl.getXml().getNamespace(); - m.xmlName = modelImpl.getXml().getName(); + m.xmlPrefix = modelImpl.getXml().getPrefix(); + m.xmlNamespace = modelImpl.getXml().getNamespace(); + m.xmlName = modelImpl.getXml().getName(); } if (modelImplCnt++ > 1) { LOGGER.warn("More than one inline schema specified in allOf:. Only the first one is recognized. All others are ignored."); @@ -1569,12 +1569,12 @@ public CodegenProperty fromProperty(String name, Property p) { property.isReadOnly = p.getReadOnly(); } if (p.getXml() != null) { - if (p.getXml().getAttribute() != null) { - property.isXmlAttribute = p.getXml().getAttribute(); - } - property.xmlPrefix = p.getXml().getPrefix(); - property.xmlName = p.getXml().getName(); - property.xmlNamespace = p.getXml().getNamespace(); + if (p.getXml().getAttribute() != null) { + property.isXmlAttribute = p.getXml().getAttribute(); + } + property.xmlPrefix = p.getXml().getPrefix(); + property.xmlName = p.getXml().getName(); + property.xmlNamespace = p.getXml().getNamespace(); } property.vendorExtensions = p.getVendorExtensions(); @@ -1582,18 +1582,18 @@ public CodegenProperty fromProperty(String name, Property p) { if (p instanceof AbstractNumericProperty) { AbstractNumericProperty np = (AbstractNumericProperty) p; if (np.getMinimum() != null) { - if (p instanceof BaseIntegerProperty) { // int, long - property.minimum = String.valueOf(np.getMinimum().longValue()); - } else { // double, decimal - property.minimum = String.valueOf(np.getMinimum()); - } + if (p instanceof BaseIntegerProperty) { // int, long + property.minimum = String.valueOf(np.getMinimum().longValue()); + } else { // double, decimal + property.minimum = String.valueOf(np.getMinimum()); + } } if (np.getMaximum() != null) { - if (p instanceof BaseIntegerProperty) { // int, long - property.maximum = String.valueOf(np.getMaximum().longValue()); - } else { // double, decimal - property.maximum = String.valueOf(np.getMaximum()); - } + if (p instanceof BaseIntegerProperty) { // int, long + property.maximum = String.valueOf(np.getMaximum().longValue()); + } else { // double, decimal + property.maximum = String.valueOf(np.getMaximum()); + } } if (np.getExclusiveMinimum() != null) { @@ -1617,7 +1617,7 @@ public CodegenProperty fromProperty(String name, Property p) { allowableValues.put("max", np.getMaximum()); } if(allowableValues.size() > 0) { - property.allowableValues = allowableValues; + property.allowableValues = allowableValues; } } @@ -1657,7 +1657,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(Integer i : _enum) { - property._enum.add(i.toString()); + property._enum.add(i.toString()); } property.isEnum = true; @@ -1675,7 +1675,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(Long i : _enum) { - property._enum.add(i.toString()); + property._enum.add(i.toString()); } property.isEnum = true; @@ -1696,9 +1696,9 @@ public CodegenProperty fromProperty(String name, Property p) { property.isFile = true; } if (p instanceof UUIDProperty) { + property.isString =true; property.isUuid = true; - // keep isString to true to make it backward compatible - property.isString = true; + } if (p instanceof ByteArrayProperty) { property.isByteArray = true; @@ -1729,7 +1729,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(Double i : _enum) { - property._enum.add(i.toString()); + property._enum.add(i.toString()); } property.isEnum = true; @@ -1747,7 +1747,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(Float i : _enum) { - property._enum.add(i.toString()); + property._enum.add(i.toString()); } property.isEnum = true; @@ -1765,7 +1765,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(String i : _enum) { - property._enum.add(i); + property._enum.add(i); } property.isEnum = true; @@ -1782,7 +1782,7 @@ public CodegenProperty fromProperty(String name, Property p) { List _enum = sp.getEnum(); property._enum = new ArrayList(); for(String i : _enum) { - property._enum.add(i); + property._enum.add(i); } property.isEnum = true; @@ -1805,16 +1805,16 @@ public CodegenProperty fromProperty(String name, Property p) { property.baseType = getSwaggerType(p); - if (p instanceof ArrayProperty) { + if (p instanceof ArrayProperty) { property.isContainer = true; property.isListContainer = true; property.containerType = "array"; property.baseType = getSwaggerType(p); if (p.getXml() != null) { - property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped(); - property.xmlPrefix= p.getXml().getPrefix(); - property.xmlNamespace = p.getXml().getNamespace(); - property.xmlName = p.getXml().getName(); + property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped(); + property.xmlPrefix= p.getXml().getPrefix(); + property.xmlNamespace = p.getXml().getNamespace(); + property.xmlName = p.getXml().getName(); } // handle inner property ArrayProperty ap = (ArrayProperty) p; @@ -1822,11 +1822,11 @@ public CodegenProperty fromProperty(String name, Property p) { property.minItems = ap.getMinItems(); String itemName = (String) p.getVendorExtensions().get("x-item-name"); if (itemName == null) { - itemName = property.name; + itemName = property.name; } CodegenProperty cp = fromProperty(itemName, ap.getItems()); updatePropertyForArray(property, cp); - } else if (p instanceof MapProperty) { + } else if (p instanceof MapProperty) { MapProperty ap = (MapProperty) p; property.isContainer = true; @@ -1915,7 +1915,7 @@ protected void updatePropertyForMap(CodegenProperty property, CodegenProperty in protected Boolean isPropertyInnerMostEnum(CodegenProperty property) { CodegenProperty currentProperty = property; while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMapContainer) - || Boolean.TRUE.equals(currentProperty.isListContainer))) { + || Boolean.TRUE.equals(currentProperty.isListContainer))) { currentProperty = currentProperty.items; } @@ -1925,7 +1925,7 @@ protected Boolean isPropertyInnerMostEnum(CodegenProperty property) { protected Map getInnerEnumAllowableValues(CodegenProperty property) { CodegenProperty currentProperty = property; while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMapContainer) - || Boolean.TRUE.equals(currentProperty.isListContainer))) { + || Boolean.TRUE.equals(currentProperty.isListContainer))) { currentProperty = currentProperty.items; } @@ -1940,7 +1940,7 @@ protected Map getInnerEnumAllowableValues(CodegenProperty proper protected void updateDataTypeWithEnumForArray(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } if (baseItem != null) { @@ -1965,7 +1965,7 @@ protected void updateDataTypeWithEnumForArray(CodegenProperty property) { protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } @@ -2295,14 +2295,14 @@ public CodegenOperation fromOperation(String path, // move "required" parameters in front of "optional" parameters if (sortParamsByRequiredFlag) { - Collections.sort(allParams, new Comparator() { - @Override - public int compare(CodegenParameter one, CodegenParameter another) { - if (one.required == another.required) return 0; - else if (one.required) return -1; - else return 1; - } - }); + Collections.sort(allParams, new Comparator() { + @Override + public int compare(CodegenParameter one, CodegenParameter another) { + if (one.required == another.required) return 0; + else if (one.required) return -1; + else return 1; + } + }); } op.allParams = addHasMore(allParams); @@ -2371,7 +2371,9 @@ public CodegenResponse fromResponse(String responseCode, Response response) { } r.dataType = cm.datatype; - if (Boolean.TRUE.equals(cm.isString)) { + if (Boolean.TRUE.equals(cm.isString) && Boolean.TRUE.equals(cm.isUuid)) { + r.isUuid = true; + } else if (Boolean.TRUE.equals(cm.isString)){ r.isString = true; } else if (Boolean.TRUE.equals(cm.isBoolean)) { r.isBoolean = true; @@ -2397,8 +2399,6 @@ public CodegenResponse fromResponse(String responseCode, Response response) { r.isDate = true; } else if (Boolean.TRUE.equals(cm.isDateTime)) { r.isDateTime = true; - } else if (Boolean.TRUE.equals(cm.isUuid)) { - r.isUuid = true; } else { LOGGER.debug("Property type is not primitive: " + cm.datatype); } @@ -2702,6 +2702,8 @@ public CodegenParameter fromParameter(Parameter param, Set imports) { // if not specified in x-example, generate a default value if (p.vendorExtensions.containsKey("x-example")) { p.example = Json.pretty(p.vendorExtensions.get("x-example")); + } else if (Boolean.TRUE.equals(p.isUuid) && (Boolean.TRUE.equals(p.isString))) { + p.example = "38400000-8cf0-11bd-b23e-10b96e4ef00d"; } else if (Boolean.TRUE.equals(p.isString)) { p.example = p.paramName + "_example"; } else if (Boolean.TRUE.equals(p.isBoolean)) { @@ -2724,8 +2726,6 @@ public CodegenParameter fromParameter(Parameter param, Set imports) { p.example = "2013-10-20"; } else if (Boolean.TRUE.equals(p.isDateTime)) { p.example = "2013-10-20T19:20:30+01:00"; - } else if (Boolean.TRUE.equals(p.isUuid)) { - p.example = "38400000-8cf0-11bd-b23e-10b96e4ef00d"; } else if (Boolean.TRUE.equals(p.isFile)) { p.example = "/path/to/file.txt"; } @@ -2846,10 +2846,10 @@ public int compare(CodegenSecurity one, CodegenSecurity another) { } protected void setReservedWordsLowerCase(List words) { - reservedWords = new HashSet(); - for (String word : words) { - reservedWords.add(word.toLowerCase()); - } + reservedWords = new HashSet(); + for (String word : words) { + reservedWords.add(word.toLowerCase()); + } } protected boolean isReservedWord(String word) { @@ -2900,7 +2900,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri */ protected boolean needToImport(String type) { return !defaultIncludes.contains(type) - && !languageSpecificPrimitives.contains(type); + && !languageSpecificPrimitives.contains(type); } @SuppressWarnings("static-method") @@ -3075,7 +3075,7 @@ private void addVars(CodegenModel m, Map properties, List properties, List required, - Map allProperties, List allRequired) { + Map allProperties, List allRequired) { m.hasRequired = false; if (properties != null && !properties.isEmpty()) { @@ -3583,7 +3583,9 @@ public void setParameterBooleanFlagWithCodegenProperty(CodegenParameter paramete return; } - if (Boolean.TRUE.equals(property.isString)) { + if (Boolean.TRUE.equals(property.isUuid) && Boolean.TRUE.equals(property.isString)) { + parameter.isUuid = true; + } else if (Boolean.TRUE.equals(property.isString)) { parameter.isString = true; parameter.isPrimitiveType = true; } else if (Boolean.TRUE.equals(property.isBoolean)) { @@ -3609,10 +3611,6 @@ public void setParameterBooleanFlagWithCodegenProperty(CodegenParameter paramete parameter.isPrimitiveType = true; } else if (Boolean.TRUE.equals(property.isFile)) { parameter.isFile = true; - } else if (Boolean.TRUE.equals(property.isUuid)) { - parameter.isUuid = true; - // file is *not* a primitive type - //parameter.isPrimitiveType = true; } else if (Boolean.TRUE.equals(property.isDate)) { parameter.isDate = true; parameter.isPrimitiveType = true; diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/routes.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/routes.mustache index 8303ec77af3..9ab016de8c7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/routes.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/routes.mustache @@ -3,19 +3,19 @@ # ~~~~ {{#useSwaggerUI}} -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api {{/useSwaggerUI}} {{#apiInfo}} -{{#apis}} + {{#apis}} -#Functions for {{{baseName}}} API -{{#operations}} -{{#operation}} -{{httpMethod}} {{{contextPath}}}{{{path}}} controllers.{{classname}}Controller.{{operationId}}({{#pathParams}}{{paramName}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) -{{/operation}} -{{/operations}} -{{/apis}} + #Functions for {{{baseName}}} API + {{#operations}} + {{#operation}} + {{httpMethod}} {{{contextPath}}}{{{path}}} controllers.{{classname}}Controller.{{operationId}}({{#pathParams}}{{paramName}}: {{#isUuid}}java.util.UUID{{/isUuid}}{{^isUuid}}{{{dataType}}}{{/isUuid}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) + {{/operation}} + {{/operations}} + {{/apis}} {{/apiInfo}} # Map static resources from the /public folder to the /assets URL path From 96638f240809c0adc76c50a014a5a3272c93c225 Mon Sep 17 00:00:00 2001 From: Guillermo Pastor Diez Date: Wed, 4 Oct 2017 12:34:31 +0200 Subject: [PATCH 2/2] solve git problem --- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 48 +++++------ .../public/swagger.json | 4 +- .../app/Module.java | 1 + .../apimodels/AdditionalPropertiesClass.java | 4 +- .../apimodels/ArrayOfArrayOfNumberOnly.java | 2 +- .../app/apimodels/ArrayOfNumberOnly.java | 2 +- .../app/apimodels/ArrayTest.java | 6 +- .../app/apimodels/EnumArrays.java | 2 +- .../app/apimodels/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 85 ++++++++++--------- .../public/swagger.json | 47 ++++++++-- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 48 +++++------ .../public/swagger.json | 4 +- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 48 +++++------ .../public/swagger.json | 4 +- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 48 +++++------ .../public/swagger.json | 4 +- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 46 +++++----- .../app/apimodels/Pet.java | 4 +- .../conf/routes | 48 +++++------ .../public/swagger.json | 4 +- .../app/apimodels/Pet.java | 4 +- .../petstore/java-play-framework/conf/routes | 48 +++++------ .../java-play-framework/public/swagger.json | 4 +- 31 files changed, 289 insertions(+), 256 deletions(-) diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-controller-only/conf/routes b/samples/server/petstore/java-play-framework-controller-only/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework-controller-only/conf/routes +++ b/samples/server/petstore/java-play-framework-controller-only/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework-controller-only/public/swagger.json +++ b/samples/server/petstore/java-play-framework-controller-only/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/Module.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/Module.java index 058fb7ddd01..eea2541f91c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/Module.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/Module.java @@ -6,6 +6,7 @@ public class Module extends AbstractModule { @Override protected void configure() { + bind(AnotherFakeApiControllerImpInterface.class).to(AnotherFakeApiControllerImp.class); bind(FakeApiControllerImpInterface.class).to(FakeApiControllerImp.class); bind(FakeClassnameTags123ApiControllerImpInterface.class).to(FakeClassnameTags123ApiControllerImp.class); bind(PetApiControllerImpInterface.class).to(PetApiControllerImp.class); diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java index 7ad3b29d780..99f835f18a9 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java @@ -27,7 +27,7 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { if (this.mapProperty == null) { - this.mapProperty = new HashMap<>(); + this.mapProperty = new HashMap(); } this.mapProperty.put(key, mapPropertyItem); return this; @@ -52,7 +52,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map mapOfMapPropertyItem) { if (this.mapOfMapProperty == null) { - this.mapOfMapProperty = new HashMap<>(); + this.mapOfMapProperty = new HashMap>(); } this.mapOfMapProperty.put(key, mapOfMapPropertyItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java index 19f3a4841b4..4540b41081a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { if (arrayArrayNumber == null) { - arrayArrayNumber = new ArrayList<>(); + arrayArrayNumber = new ArrayList>(); } arrayArrayNumber.add(arrayArrayNumberItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java index 4d232db89ef..37d1816b7ad 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { if (arrayNumber == null) { - arrayNumber = new ArrayList<>(); + arrayNumber = new ArrayList(); } arrayNumber.add(arrayNumberItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java index 3fc13073c1a..86dc61dca28 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java @@ -30,7 +30,7 @@ public ArrayTest arrayOfString(List arrayOfString) { public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { if (arrayOfString == null) { - arrayOfString = new ArrayList<>(); + arrayOfString = new ArrayList(); } arrayOfString.add(arrayOfStringItem); return this; @@ -55,7 +55,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { if (arrayArrayOfInteger == null) { - arrayArrayOfInteger = new ArrayList<>(); + arrayArrayOfInteger = new ArrayList>(); } arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; @@ -81,7 +81,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { if (arrayArrayOfModel == null) { - arrayArrayOfModel = new ArrayList<>(); + arrayArrayOfModel = new ArrayList>(); } arrayArrayOfModel.add(arrayArrayOfModelItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java index a8f126b5124..a170c1a1383 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java @@ -105,7 +105,7 @@ public EnumArrays arrayEnum(List arrayEnum) { public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { if (arrayEnum == null) { - arrayEnum = new ArrayList<>(); + arrayEnum = new ArrayList(); } arrayEnum.add(arrayEnumItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java index 3d8ced1fc41..8ca2a523a57 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java @@ -58,7 +58,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); + this.mapMapOfString = new HashMap>(); } this.mapMapOfString.put(key, mapMapOfStringItem); return this; @@ -84,7 +84,7 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); + this.mapOfEnumString = new HashMap(); } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java index 3d8314f1e1c..04a6112333f 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java @@ -69,7 +69,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { if (this.map == null) { - this.map = new HashMap<>(); + this.map = new HashMap(); } this.map.put(key, mapItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java index d1abd7c48aa..cd7380a0af6 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes b/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes index 26b70790d0a..021e3a574f4 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes +++ b/samples/server/petstore/java-play-framework-fake-endpoints/conf/routes @@ -2,47 +2,50 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api - - -#Functions for Fake API -POST /v2/fake/outer/boolean controllers.FakeApiController.fakeOuterBooleanSerialize() -POST /v2/fake/outer/composite controllers.FakeApiController.fakeOuterCompositeSerialize() -POST /v2/fake/outer/number controllers.FakeApiController.fakeOuterNumberSerialize() -POST /v2/fake/outer/string controllers.FakeApiController.fakeOuterStringSerialize() -PATCH /v2/fake controllers.FakeApiController.testClientModel() -POST /v2/fake controllers.FakeApiController.testEndpointParameters() -GET /v2/fake controllers.FakeApiController.testEnumParameters() -GET /v2/fake/jsonFormData controllers.FakeApiController.testJsonFormData() - -#Functions for FakeClassnameTags123 API -PATCH /v2/fake_classname_test controllers.FakeClassnameTags123ApiController.testClassname() - -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) - -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() - -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + GET /api controllers.ApiDocController.api + + + #Functions for AnotherFake API + PATCH /v2/another-fake/dummy controllers.AnotherFakeApiController.testSpecialTags() + + #Functions for Fake API + POST /v2/fake/outer/boolean controllers.FakeApiController.fakeOuterBooleanSerialize() + POST /v2/fake/outer/composite controllers.FakeApiController.fakeOuterCompositeSerialize() + POST /v2/fake/outer/number controllers.FakeApiController.fakeOuterNumberSerialize() + POST /v2/fake/outer/string controllers.FakeApiController.fakeOuterStringSerialize() + PATCH /v2/fake controllers.FakeApiController.testClientModel() + POST /v2/fake controllers.FakeApiController.testEndpointParameters() + GET /v2/fake controllers.FakeApiController.testEnumParameters() + GET /v2/fake/jsonFormData controllers.FakeApiController.testJsonFormData() + + #Functions for FakeClassnameTags123 API + PATCH /v2/fake_classname_test controllers.FakeClassnameTags123ApiController.testClassname() + + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() + + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json index b6ec73c0ce2..d324af94de7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json @@ -1087,6 +1087,35 @@ "x-contentType" : "application/json", "x-accepts" : "application/json" } + }, + "/another-fake/dummy" : { + "patch" : { + "tags" : [ "$another-fake?" ], + "summary" : "To test special tags", + "description" : "To test special tags", + "operationId" : "test_special_tags", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "client model", + "required" : true, + "schema" : { + "$ref" : "#/definitions/Client" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/Client" + } + } + }, + "x-contentType" : "application/json", + "x-accepts" : "application/json" + } } }, "securityDefinitions" : { @@ -1744,15 +1773,6 @@ "type" : "string", "enum" : [ "placed", "approved", "delivered" ] }, - "OuterNumber" : { - "type" : "number" - }, - "OuterString" : { - "type" : "string" - }, - "OuterBoolean" : { - "type" : "boolean" - }, "OuterComposite" : { "type" : "object", "properties" : { @@ -1771,6 +1791,15 @@ "my_number" : { }, "my_boolean" : { } } + }, + "OuterNumber" : { + "type" : "number" + }, + "OuterString" : { + "type" : "string" + }, + "OuterBoolean" : { + "type" : "boolean" } }, "externalDocs" : { diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java index e6adacc5d5c..5fe7d9b1b21 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java @@ -24,7 +24,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -145,7 +145,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes b/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes +++ b/samples/server/petstore/java-play-framework-no-bean-validation/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes b/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes +++ b/samples/server/petstore/java-play-framework-no-exception-handling/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-no-interface/conf/routes b/samples/server/petstore/java-play-framework-no-interface/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework-no-interface/conf/routes +++ b/samples/server/petstore/java-play-framework-no-interface/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes b/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes index faa1a4f028f..4bbbee5d51b 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/conf/routes @@ -4,31 +4,31 @@ -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes b/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java index 430bbe805ce..fc1f5c41515 100644 --- a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java @@ -25,7 +25,7 @@ public class Pet { private String name = null; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private List photoUrls = new ArrayList(); @JsonProperty("tags") private List tags = null; @@ -149,7 +149,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (tags == null) { - tags = new ArrayList<>(); + tags = new ArrayList(); } tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-play-framework/conf/routes b/samples/server/petstore/java-play-framework/conf/routes index 775497a59fc..80725da2d0d 100644 --- a/samples/server/petstore/java-play-framework/conf/routes +++ b/samples/server/petstore/java-play-framework/conf/routes @@ -2,34 +2,34 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /api controllers.ApiDocController.api + GET /api controllers.ApiDocController.api -#Functions for Pet API -POST /v2/pet controllers.PetApiController.addPet() -DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) -GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() -GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() -GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) -PUT /v2/pet controllers.PetApiController.updatePet() -POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) -POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) + #Functions for Pet API + POST /v2/pet controllers.PetApiController.addPet() + DELETE /v2/pet/:petId controllers.PetApiController.deletePet(petId: Long) + GET /v2/pet/findByStatus controllers.PetApiController.findPetsByStatus() + GET /v2/pet/findByTags controllers.PetApiController.findPetsByTags() + GET /v2/pet/:petId controllers.PetApiController.getPetById(petId: Long) + PUT /v2/pet controllers.PetApiController.updatePet() + POST /v2/pet/:petId controllers.PetApiController.updatePetWithForm(petId: Long) + POST /v2/pet/:petId/uploadImage controllers.PetApiController.uploadFile(petId: Long) -#Functions for Store API -DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) -GET /v2/store/inventory controllers.StoreApiController.getInventory() -GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) -POST /v2/store/order controllers.StoreApiController.placeOrder() + #Functions for Store API + DELETE /v2/store/order/:orderId controllers.StoreApiController.deleteOrder(orderId: String) + GET /v2/store/inventory controllers.StoreApiController.getInventory() + GET /v2/store/order/:orderId controllers.StoreApiController.getOrderById(orderId: Long) + POST /v2/store/order controllers.StoreApiController.placeOrder() -#Functions for User API -POST /v2/user controllers.UserApiController.createUser() -POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() -POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() -DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) -GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) -GET /v2/user/login controllers.UserApiController.loginUser() -GET /v2/user/logout controllers.UserApiController.logoutUser() -PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) + #Functions for User API + POST /v2/user controllers.UserApiController.createUser() + POST /v2/user/createWithArray controllers.UserApiController.createUsersWithArrayInput() + POST /v2/user/createWithList controllers.UserApiController.createUsersWithListInput() + DELETE /v2/user/:username controllers.UserApiController.deleteUser(username: String) + GET /v2/user/:username controllers.UserApiController.getUserByName(username: String) + GET /v2/user/login controllers.UserApiController.loginUser() + GET /v2/user/logout controllers.UserApiController.logoutUser() + PUT /v2/user/:username controllers.UserApiController.updateUser(username: String) # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(file) diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index 1c7b9a12eba..bf0a7a26545 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ],