Skip to content

Commit 9aa4ae9

Browse files
wing328wing328
committed
fix enum for jaxrs and resteasy
1 parent a184967 commit 9aa4ae9

File tree

21 files changed

+135
-111
lines changed

21 files changed

+135
-111
lines changed

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/enumClass.mustache

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1+
/**
2+
* {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
3+
*/
4+
public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
5+
{{#allowableValues}}
6+
{{#enumVars}}
7+
{{{name}}}({{{value}}}){{^-last}},
18

2-
public enum {{{datatypeWithEnum}}} {
3-
{{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
4-
{{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
9+
{{/-last}}{{#-last}};
10+
{{/-last}}
11+
{{/enumVars}}
12+
{{/allowableValues}}
13+
private {{datatype}} value;
514

6-
private String value;
7-
8-
{{{datatypeWithEnum}}}(String value) {
15+
{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
916
this.value = value;
1017
}
1118

1219
@Override
1320
@JsonValue
1421
public String toString() {
15-
return value;
22+
return String.valueOf(value);
1623
}
1724
}

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1+
/**
2+
* {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
3+
*/
4+
public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
5+
{{#allowableValues}}
6+
{{#enumVars}}
7+
{{{name}}}({{{value}}}){{^-last}},
18

2-
public enum {{{datatypeWithEnum}}} {
3-
{{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
4-
{{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
9+
{{/-last}}{{#-last}};
10+
{{/-last}}
11+
{{/enumVars}}
12+
{{/allowableValues}}
13+
private {{datatype}} value;
514

6-
private String value;
7-
8-
{{{datatypeWithEnum}}}(String value) {
15+
{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
916
this.value = value;
1017
}
1118

1219
@Override
1320
@JsonValue
1421
public String toString() {
15-
return value;
22+
return String.valueOf(value);
1623
}
1724
}

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.api;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
44
public class ApiException extends Exception{
55
private int code;
66
public ApiException (int code, String msg) {

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import javax.servlet.*;
66
import javax.servlet.http.HttpServletResponse;
77

8-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
99
public class ApiOriginFilter implements javax.servlet.Filter {
1010
public void doFilter(ServletRequest request, ServletResponse response,
1111
FilterChain chain) throws IOException, ServletException {

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import javax.xml.bind.annotation.XmlTransient;
44

55
@javax.xml.bind.annotation.XmlRootElement
6-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
77
public class ApiResponseMessage {
88
public static final int ERROR = 1;
99
public static final int WARNING = 2;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.api;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
44
public class NotFoundException extends ApiException {
55
private int code;
66
public NotFoundException (int code, String msg) {

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@Path("/pet")
2323

2424

25-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
25+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
2626
public class PetApi {
2727
private final PetApiService delegate = PetApiServiceFactory.getPetApi();
2828

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import javax.ws.rs.core.Response;
1818
import javax.ws.rs.core.SecurityContext;
1919

20-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
20+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
2121
public abstract class PetApiService {
2222
public abstract Response addPet(Pet body,SecurityContext securityContext)
2323
throws NotFoundException;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@Path("/store")
2121

2222

23-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
23+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
2424
public class StoreApi {
2525
private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
2626

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import javax.ws.rs.core.Response;
1616
import javax.ws.rs.core.SecurityContext;
1717

18-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
18+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1919
public abstract class StoreApiService {
2020
public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
2121
throws NotFoundException;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.api;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
44
public class StringUtil {
55
/**
66
* Check if the given array contains the given value (with case-insensitive comparison).

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@Path("/user")
2121

2222

23-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
23+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
2424
public class UserApi {
2525
private final UserApiService delegate = UserApiServiceFactory.getUserApi();
2626

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import javax.ws.rs.core.Response;
1616
import javax.ws.rs.core.SecurityContext;
1717

18-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
18+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1919
public abstract class UserApiService {
2020
public abstract Response createUser(User body,SecurityContext securityContext)
2121
throws NotFoundException;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010

11-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
11+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1212
public class Category {
1313

1414
private Long id = null;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ModelApiResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010

11-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
11+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1212
public class ModelApiResponse {
1313

1414
private Integer code = null;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,23 @@
99

1010

1111

12-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
12+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1313
public class Order {
1414

1515
private Long id = null;
1616
private Long petId = null;
1717
private Integer quantity = null;
1818
private Date shipDate = null;
1919

20-
20+
/**
21+
* Order Status
22+
*/
2123
public enum StatusEnum {
2224
PLACED("placed"),
23-
APPROVED("approved"),
24-
DELIVERED("delivered");
2525

26+
APPROVED("approved"),
27+
28+
DELIVERED("delivered");
2629
private String value;
2730

2831
StatusEnum(String value) {
@@ -32,7 +35,7 @@ public enum StatusEnum {
3235
@Override
3336
@JsonValue
3437
public String toString() {
35-
return value;
38+
return String.valueOf(value);
3639
}
3740
}
3841

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313

14-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
14+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1515
public class Pet {
1616

1717
private Long id = null;
@@ -20,12 +20,15 @@ public class Pet {
2020
private List<String> photoUrls = new ArrayList<String>();
2121
private List<Tag> tags = new ArrayList<Tag>();
2222

23-
23+
/**
24+
* pet status in the store
25+
*/
2426
public enum StatusEnum {
2527
AVAILABLE("available"),
26-
PENDING("pending"),
27-
SOLD("sold");
2828

29+
PENDING("pending"),
30+
31+
SOLD("sold");
2932
private String value;
3033

3134
StatusEnum(String value) {
@@ -35,7 +38,7 @@ public enum StatusEnum {
3538
@Override
3639
@JsonValue
3740
public String toString() {
38-
return value;
41+
return String.valueOf(value);
3942
}
4043
}
4144

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010

11-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
11+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1212
public class Tag {
1313

1414
private Long id = null;

‎samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010

11-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
11+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
1212
public class User {
1313

1414
private Long id = null;

‎samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ public class Order {
1919
private Integer quantity = null;
2020
private Date shipDate = null;
2121

22-
22+
/**
23+
* Order Status
24+
*/
2325
public enum StatusEnum {
2426
PLACED("placed"),
25-
APPROVED("approved"),
26-
DELIVERED("delivered");
2727

28+
APPROVED("approved"),
29+
30+
DELIVERED("delivered");
2831
private String value;
2932

3033
StatusEnum(String value) {
@@ -34,7 +37,7 @@ public enum StatusEnum {
3437
@Override
3538
@JsonValue
3639
public String toString() {
37-
return value;
40+
return String.valueOf(value);
3841
}
3942
}
4043

0 commit comments

Comments
 (0)