Merge pull request #458 from swagger-api/codegen-issue9203

refs swagger-api/swagger-codegen#9203 - Remove duplicated `isis` boolean property getter and other java fixes

Author: frantuma

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

@@ -947,7 +947,9 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         }
         if (model.discriminator != null && model.discriminator.getPropertyName().equals(property.baseName)) {
             property.vendorExtensions.put("x-is-discriminator-property", true);
-            model.imports.add("JsonTypeId");
+            if (additionalProperties.containsKey("jackson")) {
+                model.imports.add("JsonTypeId");
+            }
         }
     }
 

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaJAXRSServerCodegen.java

@@ -95,8 +95,8 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         if (!this.additionalProperties.containsKey("serverPort")) {
             final URL urlInfo = URLPathUtil.getServerURL(openAPI);
             String port = "8080"; // Default value for a JEE Server
-            if ( urlInfo != null && urlInfo.getPort() != 0) {
-                port = String.valueOf(urlInfo.getPort());
+            if ( urlInfo != null && urlInfo.getPort() > 0) {
+                    port = String.valueOf(urlInfo.getPort());
             }
             this.additionalProperties.put("serverPort", port);
         }

src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java

@@ -720,10 +720,6 @@ public void setParameterExampleValue(CodegenParameter p) {
         }
     }
 
-    public String toBooleanGetter(String name) {
-        return getterAndSetterCapitalize(name);
-    }
-
     public void setTitle(String title) {
         this.title = title;
     }

src/main/resources/handlebars/JavaJaxRS/cxf-cdi/pojo.mustache

@@ -41,7 +41,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#useOas2}}@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useOas2}}
   {{^useOas2}}@Schema({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"){{/useOas2}}
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

src/main/resources/handlebars/JavaJaxRS/cxf/pojo.mustache

@@ -69,14 +69,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfa
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#is this 'enum'}}{{#isNot this 'list-container'}}{{#isNot this 'map-container'}}public {{datatype}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#is this 'enum'}}{{#isNot this 'list-container'}}{{#isNot this 'map-container'}}public {{datatype}} {{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.getValue();
-  }{{/isNot}}{{/isNot}}{{/is}}{{#is this 'enum'}}{{#is this 'list-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/isNot}}{{/isNot}}{{/is}}{{#is this 'enum'}}{{#is this 'list-container'}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};

src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/api.mustache

@@ -29,7 +29,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.*;
 
-@Path("/{{{baseName}}}")
+{{#apiBasePath}}@Path("/{{{apiBasePath}}}"){{/apiBasePath}}
+{{^apiBasePath}}@Path("/{{{baseName}}}"){{/apiBasePath}}
 {{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(description = "the {{{baseName}}} API")
@@ -57,7 +58,7 @@ public class {{classname}}  {
         {{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
         {{/parameters}}@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.{{nickname}}({{#parameters}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/parameters}}securityContext);
+        return delegate.{{nickname}}({{#parameters}}{{#isFile}} {{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/parameters}}securityContext);
     }
 {{/contents}}
 {{/operation}}

src/main/resources/handlebars/JavaJaxRS/resteasy/README.mustache

@@ -10,7 +10,7 @@ This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
 To run the server, please execute the following:
 
 ```
-mvn clean package jetty:run
+mvn clean package
 ```
 
 You can then view the swagger listing here:

src/main/resources/handlebars/JavaJaxRS/resteasy/eap/pojo.mustache

@@ -40,7 +40,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @Schema({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}")
   {{/useOas2}}
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

src/main/resources/handlebars/JavaJaxRS/resteasy/gradle.mustache

@@ -22,6 +22,7 @@ dependencies {
     compile         'io.swagger.core.v3:swagger-annotations:2.0.0'
     {{/useOas2}}
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
+    compile         'org.apache.httpcomponents:httpclient:4.5.10'
 {{#useBeanValidation}}
     providedCompile 'javax.validation:validation-api:1.1.0.Final'
 {{/useBeanValidation}}
@@ -37,7 +38,7 @@ dependencies {
     compile 'io.swagger:swagger-jaxrs:1.5.12'
     {{/useOas2}}
     {{^useOas2}}
-    compile 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'
+    compile 'io.swagger.core.v3:swagger-jaxrs2:2.0.9'
     {{/useOas2}}
 
     testCompile     'junit:junit:4.12',

src/main/resources/handlebars/JavaJaxRS/resteasy/pojo.mustache

@@ -35,7 +35,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @Schema({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}")
   {{/useOas2}}
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {