[JAX-RS] fix library setting "jersey2" (#3016)

* to fix #2981

* update sample, update ci to include jaxrs (jersey1, 2)

* avoid duplicated artifactId in pom (jaxrs jersey1)

* update jetty dependency for jersey1 jaxrs

* update bin to set proper artifact-id

* fix jersey1 jaxrs pom.xml

* fix dependency in jaxrs jersey2 pom

* downgrade jetty plugin to 9.3.0.v20150612

* update petstore sample for jaxrs jersey 1

* restore jetty to previous version. update test order

* downgrade jetty maven plugin version

* restore original version of jetty plugin

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

@@ -8,10 +8,12 @@ import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.*;
 
-public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
-{
+public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen {
     /**
      * Name of the sub-directory in "src/main/resource" where to find the
      * Mustache template for the JAX-RS Codegen.
@@ -19,6 +21,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
     protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS";
     protected String implFolder = "src/main/java";
     protected String title = "Swagger Server";
+    static Logger LOGGER = LoggerFactory.getLogger(AbstractJavaJAXRSServerCodegen.class);
 
     public AbstractJavaJAXRSServerCodegen()
     {
@@ -199,4 +202,5 @@ public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
     public boolean shouldOverwrite(String filename) {
         return super.shouldOverwrite(filename) && !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
     }
+
 }

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

@@ -6,6 +6,8 @@ import io.swagger.models.Operation;
 import java.io.File;
 import java.util.*;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public JavaJerseyServerCodegen() {
         super();
@@ -26,7 +28,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
         additionalProperties.put("title", title);
 
-        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
+        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME;
 
         for ( int i = 0; i < cliOptions.size(); i++ ) {
             if ( CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt()) ) {
@@ -36,13 +38,11 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
         }
 
         CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
-        library.setDefault(DEFAULT_LIBRARY);
 
-        Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
-
-        supportedLibraries.put(DEFAULT_LIBRARY, "Jersey core 1.18.1");
-        supportedLibraries.put("jersey2", "Jersey core 2.x");
+        supportedLibraries.put("jersey1", "Jersey core 1.x");
+        supportedLibraries.put("jersey2", "Jersey core 2.x (default)");
         library.setEnum(supportedLibraries);
+        library.setDefault("jersey1");
 
         cliOptions.add(library);
         cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));
@@ -73,16 +73,35 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public void processOpts() {
         super.processOpts();
 
+        // set jersey2 as default
+        if (StringUtils.isEmpty(library)) {
+            setLibrary("jersey2");
+        }
+
+        supportingFiles.clear();
+
         // clear model and api doc template as this codegen 
         // does not support auto-generated markdown doc at the moment
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");
 
-        if ( additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER) ) {
+        if ( additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER)) {
             implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
         }
 
-        supportingFiles.clear();
+        if (additionalProperties.containsKey("dateLibrary")) {
+            setDateLibrary(additionalProperties.get("dateLibrary").toString());
+            additionalProperties.put(dateLibrary, "true");
+        }
+
+        if ("joda".equals(dateLibrary)) {
+            supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
+        } else if ( "java8".equals(dateLibrary) ) {
+            supportingFiles.add(new SupportingFile("LocalDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
+        }
+
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("ApiException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiException.java"));
@@ -91,40 +110,8 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
         supportingFiles.add(new SupportingFile("NotFoundException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "NotFoundException.java"));
         supportingFiles.add(new SupportingFile("jacksonJsonProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JacksonJsonProvider.java"));
         writeOptional(outputFolder, new SupportingFile("bootstrap.mustache", (implFolder + '/' + apiPackage).replace(".", "/"), "Bootstrap.java"));
-
         writeOptional(outputFolder, new SupportingFile("web.mustache", ("src/main/webapp/WEB-INF"), "web.xml"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java"));
-
-        if ( additionalProperties.containsKey("dateLibrary") ) {
-            setDateLibrary(additionalProperties.get("dateLibrary").toString());
-            additionalProperties.put(dateLibrary, "true");
-        }
-        if(DEFAULT_LIBRARY.equals(library) || library == null) {
-            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
-                // set to the default location
-                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
-            }
-            else {
-                templateDir += File.separator + "jersey1_18";
-            }
-        }
-        if("jersey2".equals(library)) {
-            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
-                // set to the default location
-                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey2";
-            }
-            else {
-                templateDir += File.separator + "jersey2";
-            }
-        }
-
-        if ( "joda".equals(dateLibrary) ) {
-            supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
-            supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
-        } else if ( "java8".equals(dateLibrary) ) {
-            supportingFiles.add(new SupportingFile("LocalDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateTimeProvider.java"));
-            supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
-        }
     }
 
     @Override

modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/model.mustache

@@ -1,6 +1,8 @@
 package {{package}};
 
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 {{#imports}}import {{import}};
 {{/imports}}
 

modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache

@@ -168,11 +168,12 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey-version>1.18.1</jersey-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <junit-version>4.8.1</junit-version>
+    <jersey-version>1.19.1</jersey-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-</project>
+</project>

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

@@ -1,6 +1,6 @@
 
   public enum {{{datatypeWithEnum}}} {
-    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{#allowableValues}}{{#enumVars}}{{{name}}}({{{value}}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
     private String value;

modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pom.mustache

@@ -134,12 +134,13 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey2-version>2.6</jersey2-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <junit-version>4.8.1</junit-version>
-    <logback-version>1.0.1</logback-version>
+    <jersey2-version>2.22.2</jersey2-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
+    <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-</project>
+</project>

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java

@@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets;
 
 public class AllowableValuesTest {
 
-    private static final String TEMPLATE_FILE = "JavaJaxRS/jersey1_18/allowableValues.mustache";
+    private static final String TEMPLATE_FILE = "JavaJaxRS/libraries/jersey1/allowableValues.mustache";
     private static final String PROVIDER_NAME = "operations";
 
     private static String loadClassResource(Class<?> cls, String name) throws IOException {

modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java

@@ -46,7 +46,8 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setSerializableModel(Boolean.valueOf(JaxRSServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
             times = 1;
-            clientCodegen.setLibrary(JaxRSServerOptionsProvider.DEFAULT_LIBRARY_VALUE);
+            //clientCodegen.setLibrary(JaxRSServerOptionsProvider.JAXRS_LIBRARY_VALUE);
+            clientCodegen.setLibrary("jersey1");
             times = 1;
             clientCodegen.setFullJavaUtil(Boolean.valueOf(JaxRSServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
             times = 1;

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java

@@ -2,12 +2,27 @@ package io.swagger.codegen.options;
 
 import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.JavaClientCodegen;
 
 import java.util.Map;
 
-public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
+public class JaxRSServerOptionsProvider implements OptionsProvider {
+    public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test";
+    public static final String MODEL_PACKAGE_VALUE = "package";
+    public static final String API_PACKAGE_VALUE = "apiPackage";
+    public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test";
+    public static final String SORT_PARAMS_VALUE = "false";
+    public static final String GROUP_ID_VALUE = "io.swagger.test";
+    public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
+    public static final String SOURCE_FOLDER_VALUE = "src/main/java/test";
+    public static final String LOCAL_PREFIX_VALUE = "tst";
+    public static final String DEFAULT_LIBRARY_VALUE = "jersey2";
+    public static final String SERIALIZABLE_MODEL_VALUE = "false";
+    public static final String FULL_JAVA_UTIL_VALUE = "true";
+    public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
     public static final String JODA_DATE_LIBRARY = "joda";
-    public static final String IMPL_FOLDER_VALUE = "src/main/java/impl";	
+    public static final String IMPL_FOLDER_VALUE = "src/main/java/impl";
+    public static final String JAXRS_DEFAULT_LIBRARY_VALUE = "jersey1";
 
     @Override
     public boolean isServer() {
@@ -21,13 +36,27 @@ public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
 
     @Override
     public Map<String, String> createOptions() {
-        Map<String, String> options = super.createOptions();
-
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
-        builder.putAll(options)
-            .put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
-            //.put(JavaJaxRSJersey1ServerCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda
-            .put("title", "Test title");
+        builder.put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
+            .put(JavaClientCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda
+            .put("title", "Test title")
+            .put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
+            .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
+            .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
+            .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+            .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
+            .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
+            .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
+            .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
+            .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+            .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE)
+            .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE)
+            .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE)
+            .put(CodegenConstants.LIBRARY, JAXRS_DEFAULT_LIBRARY_VALUE)
+            .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
+            .put(JavaClientCodegen.USE_RX_JAVA, "false")
+            //.put(JavaClientCodegen.DATE_LIBRARY, "joda")
+            .put("hideGenerationTimestamp", "true");
 
         return builder.build();
     }