[Java] allow setting boolean getter (is, has, get) in templates

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -1269,13 +1269,13 @@ public void writePropertyBack(String propertyKey, boolean value) {
     }
 
     /**
-     * Output the Getter name for boolean property, e.g. isActive
+     * Output the partial Getter name for boolean property, e.g. Active
      *
      * @param name the name of the property
-     * @return getter name based on naming convention
+     * @return partial getter name based on naming convention
      */
     public String toBooleanGetter(String name) {
-        return "is" + getterAndSetterCapitalize(name);
+        return getterAndSetterCapitalize(name);
     }
 
     @Override

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

@@ -118,7 +118,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}

modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache

@@ -42,7 +42,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache

@@ -33,7 +33,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache

@@ -64,16 +64,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }{{/isEnum}}
 

modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache

@@ -85,7 +85,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @JsonProperty("{{baseName}}")
   {{/jackson}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}

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

@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

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

@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache

@@ -31,7 +31,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache

@@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
  {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 

modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache

@@ -87,7 +87,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 

modules/swagger-codegen/src/main/resources/JavaVertXServer/pojo.mustache

@@ -20,7 +20,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vars}}
     {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache

@@ -78,11 +78,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}

modules/swagger-codegen/src/main/resources/java-pkmst/pojo.mustache

@@ -87,7 +87,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 

modules/swagger-codegen/src/main/resources/undertow/pojo.mustache

@@ -22,7 +22,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java

@@ -715,7 +715,7 @@ public void booleanParameterTest() {
         Assert.assertEquals(cp.baseType, "Boolean");
         Assert.assertTrue(cp.isNotContainer);
         Assert.assertTrue(cp.isBoolean);
-        Assert.assertEquals(cp.getter, "isProperty");
+        Assert.assertEquals(cp.getter, "Property");
     }
 
-}
+}

samples/client/petstore/java/feign/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/google-api-client/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/jersey1/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/jersey2/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/resteasy/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/resttemplate-withXml/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/retrofit/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/java/retrofit2rx2/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java

@@ -21,9 +21,9 @@ public class Category  {
 
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java

@@ -21,11 +21,12 @@ public class ModelApiResponse  {
 
   @ApiModelProperty(value = "")
   private Integer code = null;
+
   @ApiModelProperty(value = "")
   private String type = null;
+
   @ApiModelProperty(value = "")
   private String message = null;
-
  /**
    * Get code
    * @return code

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java

@@ -22,13 +22,17 @@ public class Order  {
 
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Long petId = null;
+
   @ApiModelProperty(value = "")
   private Integer quantity = null;
+
   @ApiModelProperty(value = "")
   private Date shipDate = null;
 
+
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -66,9 +70,9 @@ public static StatusEnum fromValue(String v) {
    * Order Status  
   **/
   private StatusEnum status = null;
+
   @ApiModelProperty(value = "")
   private Boolean complete = false;
-
  /**
    * Get id
    * @return id

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java

@@ -25,14 +25,19 @@ public class Pet  {
 
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Category category = null;
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   private String name = null;
+
   @ApiModelProperty(required = true, value = "")
   private List<String> photoUrls = new ArrayList<String>();
+
   @ApiModelProperty(value = "")
-  private List<Tag> tags = new ArrayList<Tag>();
+  private List<Tag> tags = null;
+
 
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
@@ -71,7 +76,6 @@ public static StatusEnum fromValue(String v) {
    * pet status in the store  
   **/
   private StatusEnum status = null;
-
  /**
    * Get id
    * @return id

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java

@@ -21,9 +21,9 @@ public class Tag  {
 
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java

@@ -21,24 +21,30 @@ public class User  {
 
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String username = null;
+
   @ApiModelProperty(value = "")
   private String firstName = null;
+
   @ApiModelProperty(value = "")
   private String lastName = null;
+
   @ApiModelProperty(value = "")
   private String email = null;
+
   @ApiModelProperty(value = "")
   private String password = null;
+
   @ApiModelProperty(value = "")
   private String phone = null;
+
   @ApiModelProperty(value = "User Status")
  /**
    * User Status  
   **/
   private Integer userStatus = null;
-
  /**
    * Get id
    * @return id

samples/client/petstore/spring-cloud/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT

samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */