Merge branch 'master' into codegen-issue-728

Author: shourien

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.21-SNAPSHOT</version>
+    <version>1.0.22-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -252,9 +252,9 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.21-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.21-SNAPSHOT</swagger-parser-version>
-        <swagger-core-version>2.1.2</swagger-core-version>
+        <swagger-codegen-version>3.0.22-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.0.21</swagger-parser-version>
+        <swagger-core-version>2.1.4</swagger-core-version>
         <jackson-version>2.10.3</jackson-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>

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

@@ -111,7 +111,7 @@
 import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
 
 public abstract class DefaultCodegenConfig implements CodegenConfig {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegenConfig.class);
+    protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegenConfig.class);
 
     public static final String DEFAULT_CONTENT_TYPE = "application/json";
     public static final String REQUEST_BODY_NAME = "body";
@@ -2697,7 +2697,9 @@ else if (schema instanceof ArraySchema) {
             if (codegenProperty.complexType != null) {
                 imports.add(codegenProperty.complexType);
             }
-            imports.add(codegenProperty.baseType);
+            if (codegenParameter.baseType != null) {
+                imports.add(codegenProperty.baseType);
+            }
             CodegenProperty innerCp = codegenProperty;
             while(innerCp != null) {
                 if(innerCp.complexType != null) {
@@ -2717,7 +2719,9 @@ else if (schema instanceof ArraySchema) {
             setParameterNullable(codegenParameter, codegenProperty);
 
             while (codegenProperty != null) {
-                imports.add(codegenProperty.baseType);
+                if (codegenProperty.baseType != null) {
+                    imports.add(codegenProperty.baseType);
+                }
                 codegenProperty = codegenProperty.items;
             }
         }
@@ -4313,6 +4317,7 @@ protected void addParameters(CodegenContent codegenContent, List<CodegenParamete
     protected void addCodegenContentParameters(CodegenOperation codegenOperation, List<CodegenContent> codegenContents) {
         for (CodegenContent content : codegenContents) {
             addParameters(content, codegenOperation.bodyParams);
+            addParameters(content, codegenOperation.formParams);
             addParameters(content, codegenOperation.headerParams);
             addParameters(content, codegenOperation.queryParams);
             addParameters(content, codegenOperation.pathParams);