Skip to content

Fix: Resolve problem with UUID class not found if there is almost one parameter with format as uuid #6617

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

Merged
wing328 merged 3 commits into from
Nov 22, 2017
Merged

Fix: Resolve problem with UUID class not found if there is almost one parameter with format as uuid #6617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57762cc
feat: java.util.UUID if parameter is UUID
sparta15 Oct 3, 2017
96638f2
solve git problem
sparta15 Oct 4, 2017
47b973c
Merge branch 'master' into feat/UUIDparameter
wing328 Nov 22, 2017
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
136 changes: 67 additions & 69 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions modules/swagger-codegen/src/main/resources/JavaPlayFramework/routes.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}})
Copy link
Copy Markdown
Contributor

@JFCote JFCote Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this should be done in the post processing in JavaPlayFrameworkCodegen.java instead. I think the dataType should always contain everything needed.

Copy link
Copy Markdown
Contributor

@wing328 wing328 Oct 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sparta15 have you tried the fullJavaUtil option to see if it would meet your requirement?
https://github.com/swagger-api/swagger-codegen/blob/master/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java#L338

Copy link
Copy Markdown
Contributor Author

@sparta15 sparta15 Oct 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I have a lot of work and I couldn't review the comments. I'll try the fullJavaUtiloption too

{{/operation}}
{{/operations}}
{{/apis}}
{{/apiInfo}}

# Map static resources from the /public folder to the /assets URL path
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Pet {
private String name = null;

@JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<>();
private List<String> photoUrls = new ArrayList<String>();

@JsonProperty("tags")
private List<Tag> tags = null;
Expand Down Expand Up @@ -149,7 +149,7 @@ public Pet tags(List<Tag> tags) {

public Pet addTagsItem(Tag tagsItem) {
if (tags == null) {
tags = new ArrayList<>();
tags = new ArrayList<Tag>();
}
tags.add(tagsItem);
return this;
Expand Down
48 changes: 24 additions & 24 deletions samples/server/petstore/java-play-framework-controller-only/conf/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions .../petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {

public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
if (this.mapProperty == null) {
this.mapProperty = new HashMap<>();
this.mapProperty = new HashMap<String, String>();
}
this.mapProperty.put(key, mapPropertyItem);
return this;
Expand All @@ -52,7 +52,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String

public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
if (this.mapOfMapProperty == null) {
this.mapOfMapProperty = new HashMap<>();
this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
}
this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
return this;
Expand Down
2 changes: 1 addition & 1 deletion ...r/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr

public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
if (arrayArrayNumber == null) {
arrayArrayNumber = new ArrayList<>();
arrayArrayNumber = new ArrayList<List<BigDecimal>>();
}
arrayArrayNumber.add(arrayArrayNumberItem);
return this;
Expand Down
2 changes: 1 addition & 1 deletion ...s/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {

public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
if (arrayNumber == null) {
arrayNumber = new ArrayList<>();
arrayNumber = new ArrayList<BigDecimal>();
}
arrayNumber.add(arrayNumberItem);
return this;
Expand Down
6 changes: 3 additions & 3 deletions samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ArrayTest arrayOfString(List<String> arrayOfString) {

public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
if (arrayOfString == null) {
arrayOfString = new ArrayList<>();
arrayOfString = new ArrayList<String>();
}
arrayOfString.add(arrayOfStringItem);
return this;
Expand All @@ -55,7 +55,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {

public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
if (arrayArrayOfInteger == null) {
arrayArrayOfInteger = new ArrayList<>();
arrayArrayOfInteger = new ArrayList<List<Long>>();
}
arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
return this;
Expand All @@ -81,7 +81,7 @@ public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)

public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
if (arrayArrayOfModel == null) {
arrayArrayOfModel = new ArrayList<>();
arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
}
arrayArrayOfModel.add(arrayArrayOfModelItem);
return this;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {

public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
if (arrayEnum == null) {
arrayEnum = new ArrayList<>();
arrayEnum = new ArrayList<ArrayEnumEnum>();
}
arrayEnum.add(arrayEnumItem);
return this;
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
if (this.mapMapOfString == null) {
this.mapMapOfString = new HashMap<>();
this.mapMapOfString = new HashMap<String, Map<String, String>>();
}
this.mapMapOfString.put(key, mapMapOfStringItem);
return this;
Expand All @@ -84,7 +84,7 @@ public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {

public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
if (this.mapOfEnumString == null) {
this.mapOfEnumString = new HashMap<>();
this.mapOfEnumString = new HashMap<String, InnerEnum>();
}
this.mapOfEnumString.put(key, mapOfEnumStringItem);
return this;
Expand Down
2 changes: 1 addition & 1 deletion ...y-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)

public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
if (this.map == null) {
this.map = new HashMap<>();
this.map = new HashMap<String, Animal>();
}
this.map.put(key, mapItem);
return this;
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Pet {
private String name = null;

@JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<>();
private List<String> photoUrls = new ArrayList<String>();

@JsonProperty("tags")
private List<Tag> tags = null;
Expand Down Expand Up @@ -149,7 +149,7 @@ public Pet tags(List<Tag> tags) {

public Pet addTagsItem(Tag tagsItem) {
if (tags == null) {
tags = new ArrayList<>();
tags = new ArrayList<Tag>();
}
tags.add(tagsItem);
return this;
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class Pet {
private String name = null;

@JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<>();
private List<String> photoUrls = new ArrayList<String>();

@JsonProperty("tags")
private List<Tag> tags = null;
Expand Down Expand Up @@ -145,7 +145,7 @@ public Pet tags(List<Tag> tags) {

public Pet addTagsItem(Tag tagsItem) {
if (tags == null) {
tags = new ArrayList<>();
tags = new ArrayList<Tag>();
}
tags.add(tagsItem);
return this;
Expand Down
48 changes: 24 additions & 24 deletions samples/server/petstore/java-play-framework-no-bean-validation/conf/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Pet {
private String name = null;

@JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<>();
private List<String> photoUrls = new ArrayList<String>();

@JsonProperty("tags")
private List<Tag> tags = null;
Expand Down Expand Up @@ -149,7 +149,7 @@ public Pet tags(List<Tag> tags) {

public Pet addTagsItem(Tag tagsItem) {
if (tags == null) {
tags = new ArrayList<>();
tags = new ArrayList<Tag>();
}
tags.add(tagsItem);
return this;
Expand Down
Loading