Refine CXF Add Spring Annotation-Config + Jboss flag for CXF/Resteasy

modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java

@@ -310,7 +310,10 @@ public void execute() throws MojoExecutionException {
         }
 
         if (addCompileSourceRoot) {
-            String sourceJavaFolder = output.toString() + "/" + configOptions.get(CodegenConstants.SOURCE_FOLDER);
+            final Object sourceFolderObject = configOptions.get(CodegenConstants.SOURCE_FOLDER);
+            final String sourceFolder =  sourceFolderObject == null ? "src/main/java" : sourceFolderObject.toString();
+
+            String sourceJavaFolder = output.toString() + "/" + sourceFolder;
             project.addCompileSourceRoot(sourceJavaFolder);
         }
     }

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -1892,7 +1892,11 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
             for (String key : consumes) {
                 Map<String, String> mediaType = new HashMap<String, String>();
                 // escape quotation to avoid code injection
-                mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                if ("*/*".equals(key)) { // "*/*" is a special case, do nothing
+                    mediaType.put("mediaType", key);
+                } else {
+                    mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                }
                 count += 1;
                 if (count < consumes.size()) {
                     mediaType.put("hasMore", "true");
@@ -1926,7 +1930,11 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
             for (String key : produces) {
                 Map<String, String> mediaType = new HashMap<String, String>();
                 // escape quotation to avoid code injection
-                mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                if ("*/*".equals(key)) { // "*/*" is a special case, do nothing
+                    mediaType.put("mediaType", key);
+                } else {
+                    mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                }
                 count += 1;
                 if (count < produces.size()) {
                     mediaType.put("hasMore", "true");

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

@@ -141,7 +141,7 @@ public List<File> generate() {
         config.additionalProperties().put("generatedDate", DateTime.now().toString());
         config.additionalProperties().put("generatorClass", config.getClass().toString());
         config.additionalProperties().put("inputSpec", config.getInputSpec());
-        
+
         if (swagger.getInfo() != null) {
             Info info = swagger.getInfo();
             if (info.getTitle() != null) {
@@ -405,6 +405,7 @@ public int compare(CodegenOperation one, CodegenOperation another) {
                     operation.put("classname", config.toApiName(tag));
                     operation.put("classVarName", config.toApiVarName(tag));
                     operation.put("importPath", config.toApiImport(tag));
+                    operation.put("classFilename", config.toApiFilename(tag));
 
                     if(!config.vendorExtensions().isEmpty()) {
                     	operation.put("vendorExtensions", config.vendorExtensions());

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

@@ -139,8 +139,11 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
                         }
                     }
                 }
+
                 if ( operation.returnType == null ) {
                     operation.returnType = "void";
+                    // set vendorExtensions.x-java-is-response-void to true as returnType is set to "void"
+                    operation.vendorExtensions.put("x-java-is-response-void", true);
                 } else if ( operation.returnType.startsWith("List") ) {
                     String rt = operation.returnType;
                     int end = rt.lastIndexOf(">");

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

@@ -10,6 +10,8 @@ public class AspNet5ServerCodegen extends AspNetCoreServerCodegen {
 
     public AspNet5ServerCodegen() {
         super();
+
+        embeddedTemplateDir = templateDir = "aspnetcore";
     }
 
     @Override

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

@@ -14,11 +14,14 @@
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.SupportingFile;
-import io.swagger.codegen.languages.features.CXFFeatures;
-import io.swagger.codegen.languages.features.LoggingFeatures;
+import io.swagger.codegen.languages.features.BeanValidationFeatures;
+import io.swagger.codegen.languages.features.GzipTestFeatures;
+import io.swagger.codegen.languages.features.JaxbFeatures;
+import io.swagger.codegen.languages.features.LoggingTestFeatures;
 import io.swagger.models.Operation;
 
-public class JavaCXFClientCodegen extends AbstractJavaCodegen implements CXFFeatures 
+public class JavaCXFClientCodegen extends AbstractJavaCodegen
+        implements BeanValidationFeatures, JaxbFeatures, GzipTestFeatures, LoggingTestFeatures 
 {   
     private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodegen.class);
 
@@ -28,14 +31,13 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen implements CXFFeat
      */
     protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS";
 
+    protected boolean useJaxbAnnotations = true;
+
     protected boolean useBeanValidation = false;
 
-    protected boolean useGzipFeature = false;
-
-    protected boolean useLoggingFeature = false;
-
-    protected boolean useBeanValidationFeature = false;
+    protected boolean useGzipFeatureForTests = false;
 
+    protected boolean useLoggingFeatureForTests = false;
 
     public JavaCXFClientCodegen()
     {
@@ -67,11 +69,12 @@ public JavaCXFClientCodegen()
 
         embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
 
+        cliOptions.add(CliOption.newBoolean(USE_JAXB_ANNOTATIONS, "Use JAXB annotations for XML"));
+
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
 
-        cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Use Gzip Feature"));
-        cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION_FEATURE, "Use BeanValidation Feature"));
-        cliOptions.add(CliOption.newBoolean(USE_LOGGING_FEATURE, "Use Logging Feature"));
+        cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE_FOR_TESTS, "Use Gzip Feature for tests"));
+        cliOptions.add(CliOption.newBoolean(USE_LOGGING_FEATURE_FOR_TESTS, "Use Logging Feature for tests"));
 
 
     }
@@ -82,19 +85,19 @@ public void processOpts()
     {
         super.processOpts();
 
+        if (additionalProperties.containsKey(USE_JAXB_ANNOTATIONS)) {
+            boolean useJaxbAnnotationsProp = convertPropertyToBooleanAndWriteBack(USE_JAXB_ANNOTATIONS);
+            this.setUseJaxbAnnotations(useJaxbAnnotationsProp);
+        }
+
         if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
             boolean useBeanValidationProp = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION);
             this.setUseBeanValidation(useBeanValidationProp);
         }
 
-        this.setUseGzipFeature(convertPropertyToBooleanAndWriteBack(USE_GZIP_FEATURE));
-        this.setUseLoggingFeature(convertPropertyToBooleanAndWriteBack(USE_LOGGING_FEATURE));
+        this.setUseGzipFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_GZIP_FEATURE_FOR_TESTS));
+        this.setUseLoggingFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_LOGGING_FEATURE_FOR_TESTS));
 
-        boolean useBeanValidationFeature = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION_FEATURE);
-            this.setUseBeanValidationFeature(useBeanValidationFeature);
-            if (useBeanValidationFeature) {
-                LOGGER.info("make sure your client supports Bean Validation 1.1");
-            }
 
         supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
 
@@ -141,18 +144,16 @@ public void setUseBeanValidation(boolean useBeanValidation) {
     }
 
 
-    public void setUseGzipFeature(boolean useGzipFeature) {
-        this.useGzipFeature = useGzipFeature;
+    public void setUseJaxbAnnotations(boolean useJaxbAnnotations) {
+        this.useJaxbAnnotations = useJaxbAnnotations;
     }
 
-
-    public void setUseLoggingFeature(boolean useLoggingFeature) {
-        this.useLoggingFeature = useLoggingFeature;
+    public void setUseGzipFeatureForTests(boolean useGzipFeatureForTests) {
+        this.useGzipFeatureForTests = useGzipFeatureForTests;
     }
 
-
-    public void setUseBeanValidationFeature(boolean useBeanValidationFeature) {
-        this.useBeanValidationFeature = useBeanValidationFeature;
+    public void setUseLoggingFeatureForTests(boolean useLoggingFeatureForTests) {
+        this.useLoggingFeatureForTests = useLoggingFeatureForTests;
     }
-    
+
 }

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

@@ -14,30 +14,44 @@
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.codegen.languages.features.CXFServerFeatures;
+import io.swagger.codegen.languages.features.GzipTestFeatures;
+import io.swagger.codegen.languages.features.JaxbFeatures;
+import io.swagger.codegen.languages.features.LoggingTestFeatures;
 import io.swagger.models.Operation;
 
-public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen implements CXFServerFeatures
+public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
+        implements CXFServerFeatures, GzipTestFeatures, LoggingTestFeatures, JaxbFeatures
 {   
     private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFServerCodegen.class);
 
+    protected boolean useJaxbAnnotations = true;
+
     protected boolean useBeanValidation = false;
 
     protected boolean generateSpringApplication = false;
 
+    protected boolean useSpringAnnotationConfig = false;
+
     protected boolean useSwaggerFeature = false;
 
     protected boolean useWadlFeature = false;
 
     protected boolean useMultipartFeature = false;
 
-    protected boolean useGzipFeature = false;
-
-    protected boolean useLoggingFeature = false;
-
     protected boolean useBeanValidationFeature = false;
 
     protected boolean generateSpringBootApplication= false;
 
+    protected boolean generateJbossDeploymentDescriptor = false;
+
+    protected boolean useGzipFeature = false;
+
+    protected boolean useGzipFeatureForTests = false;
+
+    protected boolean useLoggingFeature = false;
+
+    protected boolean useLoggingFeatureForTests = false;
+
     public JavaCXFServerCodegen()
     {
         super();
@@ -64,17 +78,26 @@ public JavaCXFServerCodegen()
 
         embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
 
+        cliOptions.add(CliOption.newBoolean(USE_JAXB_ANNOTATIONS, "Use JAXB annotations for XML"));
+
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
         cliOptions.add(CliOption.newBoolean(GENERATE_SPRING_APPLICATION, "Generate Spring application"));
+        cliOptions.add(CliOption.newBoolean(USE_SPRING_ANNOTATION_CONFIG, "Use Spring Annotation Config"));
 
         cliOptions.add(CliOption.newBoolean(USE_SWAGGER_FEATURE, "Use Swagger Feature"));
         cliOptions.add(CliOption.newBoolean(USE_WADL_FEATURE, "Use WADL Feature"));
         cliOptions.add(CliOption.newBoolean(USE_MULTIPART_FEATURE, "Use Multipart Feature"));
+
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Use Gzip Feature"));
+        cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE_FOR_TESTS, "Use Gzip Feature for tests"));
+
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION_FEATURE, "Use BeanValidation Feature"));
         cliOptions.add(CliOption.newBoolean(USE_LOGGING_FEATURE, "Use Logging Feature"));
+        cliOptions.add(CliOption.newBoolean(USE_LOGGING_FEATURE_FOR_TESTS, "Use Logging Feature for tests"));
 
         cliOptions.add(CliOption.newBoolean(GENERATE_SPRING_BOOT_APPLICATION, "Generate Spring Boot application"));
+        cliOptions.add(
+                CliOption.newBoolean(GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR, "Generate Jboss Deployment Descriptor"));
 
 
     }
@@ -85,6 +108,11 @@ public void processOpts()
     {
         super.processOpts();
 
+        if (additionalProperties.containsKey(USE_JAXB_ANNOTATIONS)) {
+            boolean useJaxbAnnotationsProp = convertPropertyToBooleanAndWriteBack(USE_JAXB_ANNOTATIONS);
+            this.setUseJaxbAnnotations(useJaxbAnnotationsProp);
+        }
+
         if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
             boolean useBeanValidationProp = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION);
             this.setUseBeanValidation(useBeanValidationProp);
@@ -97,7 +125,10 @@ public void processOpts()
             this.setUseWadlFeature(convertPropertyToBooleanAndWriteBack(USE_WADL_FEATURE));
             this.setUseMultipartFeature(convertPropertyToBooleanAndWriteBack(USE_MULTIPART_FEATURE));
             this.setUseGzipFeature(convertPropertyToBooleanAndWriteBack(USE_GZIP_FEATURE));
+            this.setUseGzipFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_GZIP_FEATURE_FOR_TESTS));
             this.setUseLoggingFeature(convertPropertyToBooleanAndWriteBack(USE_LOGGING_FEATURE));
+            this.setUseLoggingFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_LOGGING_FEATURE_FOR_TESTS));
+            this.setUseSpringAnnotationConfig(convertPropertyToBooleanAndWriteBack(USE_SPRING_ANNOTATION_CONFIG));
 
             boolean useBeanValidationFeature = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION_FEATURE);
             this.setUseBeanValidationFeature(useBeanValidationFeature);
@@ -107,8 +138,13 @@ public void processOpts()
 
             this.setGenerateSpringBootApplication(convertPropertyToBooleanAndWriteBack(GENERATE_SPRING_BOOT_APPLICATION));
         }
-
 
+        if (additionalProperties.containsKey(GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR)) {
+            boolean generateJbossDeploymentDescriptorProp = convertPropertyToBooleanAndWriteBack(
+                    GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR);
+            this.setGenerateJbossDeploymentDescriptor(generateJbossDeploymentDescriptorProp);
+        }
+
         supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
 
         writeOptional(outputFolder, new SupportingFile("server/pom.mustache", "", "pom.xml"));
@@ -124,8 +160,11 @@ public void processOpts()
                     ("src/main/webapp/WEB-INF"), "context.xml"));
 
             // Jboss
-            writeOptional(outputFolder, new SupportingFile("server/jboss-web.xml.mustache",
-                    ("src/main/webapp/WEB-INF"), "jboss-web.xml"));
+            if (generateJbossDeploymentDescriptor) {
+                writeOptional(outputFolder, new SupportingFile("server/jboss-web.xml.mustache",
+                        ("src/main/webapp/WEB-INF"), "jboss-web.xml"));
+
+            }
 
             // Spring Boot
             if (this.generateSpringBootApplication) {
@@ -174,6 +213,9 @@ public void setGenerateSpringApplication(boolean generateSpringApplication) {
         this.generateSpringApplication = generateSpringApplication;
     }
 
+    public void setUseSpringAnnotationConfig(boolean useSpringAnnotationConfig) {
+        this.useSpringAnnotationConfig = useSpringAnnotationConfig;
+    }
 
     public void setUseSwaggerFeature(boolean useSwaggerFeature) {
         this.useSwaggerFeature = useSwaggerFeature;
@@ -204,7 +246,24 @@ public void setUseBeanValidationFeature(boolean useBeanValidationFeature) {
         this.useBeanValidationFeature = useBeanValidationFeature;
     }
 
-     public void setGenerateSpringBootApplication(boolean generateSpringBootApplication) {
+    public void setGenerateSpringBootApplication(boolean generateSpringBootApplication) {
         this.generateSpringBootApplication = generateSpringBootApplication;
     }
+
+    public void setUseJaxbAnnotations(boolean useJaxbAnnotations) {
+        this.useJaxbAnnotations = useJaxbAnnotations;
+    }
+
+    public void setGenerateJbossDeploymentDescriptor(boolean generateJbossDeploymentDescriptor) {
+        this.generateJbossDeploymentDescriptor = generateJbossDeploymentDescriptor;
+    }
+
+    public void setUseGzipFeatureForTests(boolean useGzipFeatureForTests) {
+        this.useGzipFeatureForTests = useGzipFeatureForTests;
+    }
+
+    public void setUseLoggingFeatureForTests(boolean useLoggingFeatureForTests) {
+        this.useLoggingFeatureForTests = useLoggingFeatureForTests;
+    }
+
 }