Fixes for JAXRS-CXF Codegen

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

@@ -2,20 +2,23 @@
 package io.swagger.codegen.languages;
 
 import java.io.File;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
 import io.swagger.models.Operation;
 
 public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
-{
+{	
 	public JavaCXFServerCodegen()
 	{
         super();
-
+        supportsInheritance = true;
         sourceFolder = "src/gen/java";
         invokerPackage = "io.swagger.api";
         artifactId = "swagger-jaxrs-server";
@@ -28,6 +31,11 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
 
         additionalProperties.put("title", title);
 
+        typeMapping.put("date", "LocalDate");
+        typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar'
+
+        importMapping.put("LocalDate", "org.joda.time.LocalDate");
+
         super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
 
         for ( int i = 0; i < cliOptions.size(); i++ ) {
@@ -36,21 +44,30 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
                 break;
             }
         }
-        
-        cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));
+                
+        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, "CXF");
+        library.setEnum(supportedLibraries);
+
+        cliOptions.add(library);
+        cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));	
         cliOptions.add(new CliOption("title", "a title describing the application"));
 	}
-
+	
 	@Override
 	public void processOpts()
 	{
 		super.processOpts();
 		sourceFolder = "gen" + File.separator + "java";
-
-		modelTemplateFiles.clear();
-		modelTemplateFiles.put("entityModel.mustache", ".java");
-
-		supportingFiles.clear();
+		supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
+      
+		//TODO
+		//final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
+        //supportingFiles.add(new SupportingFile("CXF2InterfaceComparator.mustache", invokerFolder, "CXF2InterfaceComparator.java"));
 	} 
 
 	@Override
@@ -58,14 +75,24 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
 	{
 		return "jaxrs-cxf";
 	}
-	
 
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         super.addOperationToGroup(tag, resourcePath, operation, co, operations);        
         co.subresourceOperation = !co.path.isEmpty();
     }
-
+    
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        super.postProcessModelProperty(model, property);
+        model.imports.remove("ApiModelProperty");
+        model.imports.remove("ApiModel");
+        model.imports.remove("JsonSerialize");
+        model.imports.remove("ToStringSerializer");
+        model.imports.remove("JsonValue");
+        model.imports.remove("JsonProperty");
+    }
+    
     @Override
     public String getHelp()
     {

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

@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig {
+public class JavaInflectorServerCodegen extends JavaClientCodegen {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class);