updated templates

modules/swagger-codegen/src/main/resources/android-java/model.mustache

@@ -4,6 +4,7 @@ package {{package}};
 {{/imports}}
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 {{#models}}
 
 {{#model}}{{#description}}
@@ -11,12 +12,14 @@ import com.wordnik.swagger.annotations.*;
  * {{description}}
  **/{{/description}}
 @ApiModel(description = "{{{description}}}")
-public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{#vars}}
-  private {{{datatype}}} {{name}} = {{{defaultValue}}};{{#allowableValues}}
-  
-  //{{^min}}public enum {{name}}Enum { {{#values}} {{.}}, {{/values}} }; 
-  {{/min}}{{/allowableValues}}{{/vars}}
-  
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
+  {{#vars}}{{#isEnum}}
+  public enum {{datatypeWithEnum}} {
+    {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}}
+  };
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}}
+  private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}}
+
   {{#vars}}
   /**{{#description}}
    * {{{description}}}{{/description}}{{#minimum}}
@@ -24,10 +27,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{#vars}
    * maximum: {{maximum}}{{/maximum}}
    **/
   @ApiModelProperty(required = {{required}}, value = "{{{description}}}")
-  public {{{datatype}}} {{getter}}() {
+  @JsonProperty("{{name}}")
+  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
-  public void {{setter}}({{{datatype}}} {{name}}) {
+  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
   }
 
@@ -44,4 +48,4 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{#vars}
   }
 }
 {{/model}}
-{{/models}}
+{{/models}}