fix enum for jaxrs and resteasy

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

@@ -1,17 +1,24 @@
+  /**
+   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+   */
+  public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+    {{{name}}}({{{value}}}){{^-last}},
 
-  public enum {{{datatypeWithEnum}}} {
+    {{/-last}}{{#-last}};
-    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{/-last}}
-    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+    {{/enumVars}}
+    {{/allowableValues}}
+    private {{datatype}} value;
 
-    private String value;
+    {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
-
-    {{{datatypeWithEnum}}}(String value) {
       this.value = value;
     }
 
     @Override
     @JsonValue
     public String toString() {
-      return value;
+      return String.valueOf(value);
     }
   }

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

@@ -1,17 +1,24 @@
+  /**
+   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+   */
+  public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+    {{{name}}}({{{value}}}){{^-last}},
 
-  public enum {{{datatypeWithEnum}}} {
+    {{/-last}}{{#-last}};
-    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{/-last}}
-    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+    {{/enumVars}}
+    {{/allowableValues}}
+    private {{datatype}} value;
 
-    private String value;
+    {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
-
-    {{{datatypeWithEnum}}}(String value) {
       this.value = value;
     }
 
     @Override
     @JsonValue
     public String toString() {
-      return value;
+      return String.valueOf(value);
     }
   }

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

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

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

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

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

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

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

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

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

@@ -22,7 +22,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 @Path("/pet")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 

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

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

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

@@ -20,7 +20,7 @@ import javax.ws.rs.*;
 @Path("/store")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 

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

@@ -15,7 +15,7 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public abstract class StoreApiService {
       public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;

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

@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class StringUtil {
   /**
    * 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

@@ -20,7 +20,7 @@ import javax.ws.rs.*;
 @Path("/user")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 

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

@@ -15,7 +15,7 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public abstract class UserApiService {
       public abstract Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class Category   {
   
   private Long id = null;

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class ModelApiResponse   {
   
   private Integer code = null;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class Order   {
   
   private Long id = null;
@@ -17,12 +17,15 @@ public class Order   {
   private Integer quantity = null;
   private Date shipDate = null;
 
-
+  /**
+   * Order Status
+   */
   public enum StatusEnum {
     PLACED("placed"),
-    APPROVED("approved"),
-    DELIVERED("delivered");
 
+        APPROVED("approved"),
+
+        DELIVERED("delivered");
     private String value;
 
     StatusEnum(String value) {
@@ -32,7 +35,7 @@ public class Order   {
     @Override
     @JsonValue
     public String toString() {
-      return value;
+      return String.valueOf(value);
     }
   }
 

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -20,12 +20,15 @@ public class Pet   {
   private List<String> photoUrls = new ArrayList<String>();
   private List<Tag> tags = new ArrayList<Tag>();
 
-
+  /**
+   * pet status in the store
+   */
   public enum StatusEnum {
     AVAILABLE("available"),
-    PENDING("pending"),
-    SOLD("sold");
 
+        PENDING("pending"),
+
+        SOLD("sold");
     private String value;
 
     StatusEnum(String value) {
@@ -35,7 +38,7 @@ public class Pet   {
     @Override
     @JsonValue
     public String toString() {
-      return value;
+      return String.valueOf(value);
     }
   }
 

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class Tag   {
   
   private Long id = null;

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-22T19:32:21.945+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-29T00:20:47.240+08:00")
 public class User   {
   
   private Long id = null;

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

@@ -19,12 +19,15 @@ public class Order   {
   private Integer quantity = null;
   private Date shipDate = null;
 
-
+  /**
+   * Order Status
+   */
   public enum StatusEnum {
     PLACED("placed"),
-    APPROVED("approved"),
-    DELIVERED("delivered");
 
+        APPROVED("approved"),
+
+        DELIVERED("delivered");
     private String value;
 
     StatusEnum(String value) {
@@ -34,7 +37,7 @@ public class Order   {
     @Override
     @JsonValue
     public String toString() {
-      return value;
+      return String.valueOf(value);
     }
   }
 

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

@@ -1,25 +1,26 @@
-package io.swagger.client.model;
+package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.client.model.Tag;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
 
-/**
+
- * InlineResponse200
+
- */
+
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-12T23:06:12.393+08:00")
+
-public class InlineResponse200   {
+public class Pet   {
   
-  private List<String> photoUrls = new ArrayList<String>();
-  private String name = null;
   private Long id = null;
-  private Object category = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
   private List<Tag> tags = new ArrayList<Tag>();
 
   /**
@@ -27,9 +28,10 @@ public class InlineResponse200   {
    */
   public enum StatusEnum {
     AVAILABLE("available"),
-    PENDING("pending"),
-    SOLD("sold");
 
+        PENDING("pending"),
+
+        SOLD("sold");
     private String value;
 
     StatusEnum(String value) {
@@ -45,49 +47,15 @@ public class InlineResponse200   {
 
   private StatusEnum status = null;
 
-  
   /**
    **/
-  public InlineResponse200 photoUrls(List<String> photoUrls) {
+  public Pet id(Long id) {
-    this.photoUrls = photoUrls;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("photoUrls")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 name(String name) {
-    this.name = name;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "doggie", value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 id(Long id) {
     this.id = id;
     return this;
   }
+
   
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -96,32 +64,66 @@ public class InlineResponse200   {
     this.id = id;
   }
 
-  
   /**
    **/
-  public InlineResponse200 category(Object category) {
+  public Pet category(Category category) {
     this.category = category;
     return this;
   }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("category")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
 
   
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
   /**
    **/
-  public InlineResponse200 tags(List<Tag> tags) {
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  /**
+   **/
+  public Pet tags(List<Tag> tags) {
     this.tags = tags;
     return this;
   }
+
   
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -130,16 +132,16 @@ public class InlineResponse200   {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
-  public InlineResponse200 status(StatusEnum status) {
+  public Pet status(StatusEnum status) {
     this.status = status;
     return this;
   }
+
   
-  @ApiModelProperty(example = "null", value = "pet status in the store")
+  @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -148,39 +150,38 @@ public class InlineResponse200   {
     this.status = status;
   }
 
-  
 
   @Override
-  public boolean equals(java.lang.Object o) {
+  public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    Pet pet = (Pet) o;
-    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
+    return Objects.equals(id, pet.id) &&
-        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(category, pet.category) &&
-        Objects.equals(this.id, inlineResponse200.id) &&
+        Objects.equals(name, pet.name) &&
-        Objects.equals(this.category, inlineResponse200.category) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, inlineResponse200.tags) &&
+        Objects.equals(tags, pet.tags) &&
-        Objects.equals(this.status, inlineResponse200.status);
+        Objects.equals(status, pet.status);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(id, category, name, photoUrls, tags, status);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class InlineResponse200 {\n");
+    sb.append("class Pet {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("}");
@@ -191,7 +192,7 @@ public class InlineResponse200   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(java.lang.Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }