From 01353f25baa15be7d9111ced538c615fa3aae3cb Mon Sep 17 00:00:00 2001
From: Ole Lensmar <ole.lensmar@smartbear.com>
Date: Wed, 16 Mar 2016 11:30:33 -0400
Subject: [PATCH] fixed typename generation for Map<?,List<?>> types and added
 gen folder to maven build in generated pom

---
 .../languages/JavaInflectorServerCodegen.java | 15 ---------------
 .../main/resources/JavaInflector/pom.mustache | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
index 78f3653671b..24f7fddc524 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
@@ -83,21 +83,6 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen {
                 (sourceFolder + '/' + invokerPackage).replace(".", "/"), "StringUtil.java"));
     }
 
-    @Override
-    public String getTypeDeclaration(Property p) {
-        if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            Property inner = ap.getItems();
-            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-        } else if (p instanceof MapProperty) {
-            MapProperty mp = (MapProperty) p;
-            Property inner = mp.getAdditionalProperties();
-
-            return getTypeDeclaration(inner);
-        }
-        return super.getTypeDeclaration(p);
-    }
-
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         String basePath = resourcePath;
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
index d79fec75123..491d800923d 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -19,6 +19,25 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</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>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>