fixed jackson imports on models with enums and updated dependency to support PATCH annotation

Author: HugoMario

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

@@ -11,7 +11,6 @@
 import java.util.regex.Pattern;
 
 import io.swagger.models.properties.UntypedProperty;
-import io.swagger.util.Yaml;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -401,6 +400,15 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 
     // override to post-process any model properties
     @SuppressWarnings("unused")
+    public void postProcessModelProperties(CodegenModel model){
+        if (model.vars == null || model.vars.isEmpty()) {
+            return;
+        }
+        for(CodegenProperty codegenProperty : model.vars) {
+            postProcessModelProperty(model, codegenProperty);
+        }
+    }
+
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property){
     }
 
@@ -1546,11 +1554,7 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
             addVars(m, impl.getProperties(), impl.getRequired(), allDefinitions);
         }
 
-        if (m.vars != null) {
-            for(CodegenProperty prop : m.vars) {
-                postProcessModelProperty(m, prop);
-            }
-        }
+        postProcessModelProperties(m);
         return m;
     }
 

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

@@ -1,24 +1,26 @@
 package io.swagger.codegen.languages;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
+import io.swagger.models.parameters.Parameter;
 import io.swagger.util.Json;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen
 {
@@ -57,6 +59,7 @@ public JavaJAXRSSpecServerCodegen()
         typeMapping.put("date", "LocalDate");
 
         importMapping.put("LocalDate", "org.joda.time.LocalDate");
+        importMapping.put("InputStream", "java.io.InputStream");
 
         super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "spec";
 
@@ -162,6 +165,33 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         model.imports.remove("JsonProperty");
     }
 
+    @Override
+    public void postProcessModelProperties(CodegenModel model){
+        if (model.vars == null || model.vars.isEmpty()) {
+            return;
+        }
+        final boolean useJackson = Boolean.valueOf(String.valueOf(additionalProperties.get("jackson")));
+        boolean hasEnumProperty = false;
+        for(CodegenProperty codegenProperty : model.vars) {
+            postProcessModelProperty(model, codegenProperty);
+            if (codegenProperty.isEnum) {
+                hasEnumProperty = true;
+            }
+        }
+        if (useJackson && hasEnumProperty) {
+            model.imports.add("JsonValue");
+            model.imports.add("JsonCreator");
+        }
+    }
+
+    public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
+        final CodegenParameter parameter = super.fromParameter(param, imports);
+        if (parameter.isFile) {
+            imports.add("InputStream");
+        }
+        return parameter;
+    }
+
     @Override
     public void preprocessSwagger(Swagger swagger) {
         //copy input swagger to output folder
@@ -175,8 +205,7 @@ public void preprocessSwagger(Swagger swagger) {
 
     }
     @Override
-    public String getHelp()
-    {
+    public String getHelp() {
         return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
     }
 }

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

@@ -11,7 +11,7 @@ public enum {{datatypeWithEnum}} {
         value = v;
     }
 
-    public String value() {
+    public {{datatype}} value() {
         return value;
     }
 

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

@@ -1,2 +1 @@
-{{#isFormParam}}{{#notFile}}@FormParam(value = "{{baseName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream,
-   @FormParam(value = "{{baseName}}") Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{#notFile}}@FormParam(value = "{{baseName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream{{/isFile}}{{/isFormParam}}

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

@@ -33,15 +33,46 @@
           </execution>
         </executions>
       </plugin>{{/interfaceOnly}}
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/gen/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
-      <version>2.0</version>
+      <version>2.1.1</version>
       <scope>provided</scope>
     </dependency>
+    {{#jackson}}
+    <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-joda</artifactId>
+        <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    {{/jackson}}
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
@@ -85,6 +116,9 @@
 {{/useBeanValidation}}
   </dependencies>
   <properties>
+    {{#jackson}}
+    <jackson-version>2.9.9</jackson-version>
+    {{/jackson}}
     <junit-version>4.13.1</junit-version>
   </properties>
 </project>