Merge pull request swagger-api#1 in ~LUKASZ_K/swagger-codegen-zoo from feature/retrofit_client_inheritance_support_2.2.1 to zoo_release

* commit '5863d41f63e956d24cc19048e2f3266be2e4b0fb':
  refactor to use template
  move java specific code away from default codegen base
  case insensitive compare discriminator and type friendly name
  add dependency for gson-fire in buildfiles
  gson support for subclasses in server response (retrofit)

Author: konopski

modules/swagger-codegen-maven-plugin/pom.xml

@@ -9,7 +9,8 @@
         <version>2.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
-    <artifactId>swagger-codegen-maven-plugin</artifactId>
+    <artifactId>swagger-codegen-maven-plugin-zoo</artifactId>
+    <version>2.2.1.1-SNAPSHOT</version>
     <name>swagger-codegen (maven-plugin)</name>
     <packaging>maven-plugin</packaging>
     <description>maven plugin to build modules from swagger codegen</description>
@@ -45,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
-            <artifactId>swagger-codegen</artifactId>
+            <artifactId>swagger-codegen-zoo</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

modules/swagger-codegen/pom.xml

@@ -7,7 +7,8 @@
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>swagger-codegen</artifactId>
+    <artifactId>swagger-codegen-zoo</artifactId>
+    <version>2.2.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>swagger-codegen (core library)</name>
     <build>

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

@@ -637,6 +637,7 @@ public Reader getTemplate(String name) {
         return files;
     }
 
+
     private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename) throws IOException {
         if(ignoreProcessor.allowsFile(new File(outputFilename.replaceAll("//", "/")))) {
             String templateFile = getFullTemplateFile(config, templateName);

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

@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import com.google.common.collect.LinkedListMultimap;
 import io.swagger.codegen.*;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -191,6 +192,24 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         }
     }
 
+    @Override
+    public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
+        Map<String, Object> allProcessedModels = super.postProcessAllModels(objs);
+        if(!additionalProperties.containsKey("gsonFactoryMethod")) {
+            List<Object> allModels = new ArrayList<Object>();
+            for (String name: allProcessedModels.keySet()) {
+                Map<String, Object> models = (Map<String, Object>)allProcessedModels.get(name);
+                try {
+                    allModels.add(((List<Object>) models.get("models")).get(0));
+                } catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+            additionalProperties.put("parent", modelInheritanceSupportInGson(allModels));
+        }
+        return allProcessedModels;
+    }
+
     @Override
     public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
         objs = super.postProcessModelsEnum(objs);
@@ -217,4 +236,32 @@ public void setUseRxJava(boolean useRxJava) {
         this.useRxJava = useRxJava;
     }
 
+
+    private List<Map<String, Object>> modelInheritanceSupportInGson(List<?> allModels) {
+        LinkedListMultimap<CodegenModel, CodegenModel> byParent = LinkedListMultimap.create();
+        for (Object m : allModels) {
+            Map entry = (Map) m;
+            CodegenModel parent = ((CodegenModel)entry.get("model")).parentModel;
+            if(null!= parent) {
+                byParent.put(parent, ((CodegenModel)entry.get("model")));
+            }
+        }
+        List<Map<String, Object>> parentsList = new ArrayList<>();
+        for (CodegenModel parentModel : byParent.keySet()) {
+            List<Map<String, Object>> childrenList = new ArrayList<>();
+            Map<String, Object> parent = new HashMap<>();
+            parent.put("classname", parentModel.classname);
+            List<CodegenModel> childrenModels = byParent.get(parentModel);
+            for (CodegenModel model : childrenModels) {
+                Map<String, Object> child = new HashMap<>();
+                child.put("name", model.name);
+                child.put("classname", model.classname);
+                childrenList.add(child);
+            }
+            parent.put("children", childrenList);
+            parent.put("discriminator", parentModel.discriminator);
+            parentsList.add(parent);
+        }
+        return parentsList;
+    }
 }

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache

@@ -6,6 +6,7 @@ import java.lang.reflect.Type;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.HashMap;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
@@ -32,6 +33,9 @@ import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonElement;
+import io.gsonfire.GsonFireBuilder;
+import io.gsonfire.TypeSelector;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
@@ -44,6 +48,7 @@ import {{invokerPackage}}.auth.OAuth;
 import {{invokerPackage}}.auth.OAuth.AccessTokenListener;
 import {{invokerPackage}}.auth.OAuthFlow;
 
+import {{modelPackage}}.*;
 
 public class ApiClient {
 
@@ -118,8 +123,28 @@ public class ApiClient {
                 .setPassword(password);
     }
 
+    public static GsonBuilder createGson() {
+        GsonFireBuilder fireBuilder = new GsonFireBuilder()
+        {{#parent}}
+            .registerTypeSelector({{classname}}.class, new TypeSelector() {
+                @Override
+                public Class getClassForElement(JsonElement readElement) {
+                    Map classByDiscriminatorValue = new HashMap();
+                    {{#children}}
+                    classByDiscriminatorValue.put("{{name}}".toUpperCase(), {{classname}}.class);
+                    {{/children}}
+                    String discriminatorField = "{{discriminator}}";
+                    String discriminatorValue = readElement.getAsJsonObject().get(discriminatorField).getAsString();
+                    return (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+                }
+            })
+        {{/parent}}
+        ;
+        return fireBuilder.createGsonBuilder();
+    }
+
     public void createDefaultAdapter() {
-        Gson gson = new GsonBuilder()
+        Gson gson = createGson()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
                 {{^java8}}
                 .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

@@ -104,6 +104,7 @@ ext {
     {{^java8}}
     jodatime_version = "2.9.3"
     {{/java8}}
+    json_fire_version = "1.8.0"
 }
 
 dependencies {
@@ -116,6 +117,7 @@ dependencies {
     {{/useRxJava}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ""io.gsonfire:gson-fire:$json_fire_version"
     {{^java8}}
     compile "joda-time:joda-time:$jodatime_version"
     {{/java8}}

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache

@@ -12,6 +12,7 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
       {{#useRxJava}}
       "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
       "io.reactivex" % "rxjava" % "1.1.3" % "compile",

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -124,6 +124,11 @@
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.gsonfire</groupId>
+      <artifactId>gson-fire</artifactId>
+      <version>${gson-fire-version}</version>
+    </dependency>
     {{^java8}}
     <dependency>
       <groupId>joda-time</groupId>
@@ -159,6 +164,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.9</swagger-core-version>
     <retrofit-version>2.1.0</retrofit-version>
+    <gson-fire-version>1.8.0</gson-fire-version>
     {{#useRxJava}}
     <rxjava-version>1.1.6</rxjava-version>
     {{/useRxJava}}