Skip to content

[JAXRS-CXF] To fix enum value issue #3750

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 1 commit into from
Sep 8, 2016
Merged

[JAXRS-CXF] To fix enum value issue #3750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public JavaCXFServerCodegen()
outputFolder = "generated-code/JavaJaxRS-CXF";
apiTestTemplateFiles.clear(); // TODO: add test template

//TODO add auto-generated pom.xml for maven
//apiTemplateFiles.put("pom.mustache", "pom.xml");

// clear model and api doc template as this codegen
// does not support auto-generated markdown doc at the moment
//TODO: add doc templates
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public enum {{datatypeWithEnum}} {

{{#allowableValues}}
{{#enumVars}}{{name}}({{datatype}}.valueOf("{{value}}")){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
{{#enumVars}}{{name}}({{datatype}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
{{/allowableValues}}


Expand All @@ -20,4 +20,4 @@ public enum {{datatypeWithEnum}} {
public static {{datatypeWithEnum}} fromValue(String v) {
return valueOf(v);
}
}
}
78 changes: 0 additions & 78 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class Order {
@XmlEnum
public enum StatusEnum {

PLACED(String.valueOf(""placed"")), APPROVED(String.valueOf(""approved"")), DELIVERED(String.valueOf(""delivered""));
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));


private String value;
Expand All @@ -53,6 +53,7 @@ public static StatusEnum fromValue(String v) {
}
}


@XmlElement(name="status")
private StatusEnum status = null;

Expand Down
3 changes: 2 additions & 1 deletion samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class Pet {
@XmlEnum
public enum StatusEnum {

AVAILABLE(String.valueOf(""available"")), PENDING(String.valueOf(""pending"")), SOLD(String.valueOf(""sold""));
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));


private String value;
Expand All @@ -60,6 +60,7 @@ public static StatusEnum fromValue(String v) {
}
}


@XmlElement(name="status")
private StatusEnum status = null;

Expand Down
Loading