Merge pull request #999 from swagger-api/java-generators-templates-tweak

Java generators templates tweak

Author: HugoMario

src/main/resources/handlebars/Java/libraries/feign/ApiClient.mustache

@@ -53,7 +53,7 @@ public class ApiClient {
     this();
     for(String authName : authNames) {
       {{#hasAuthMethods}}
-      RequestInterceptor auth;
+      RequestInterceptor auth = null;
       {{#authMethods}}if ("{{name}}".equals(authName)) {
       {{#is this 'basic'}}
         auth = new HttpBasicAuth();

src/main/resources/handlebars/Java/libraries/retrofit/ApiClient.mustache

@@ -54,7 +54,7 @@ public class ApiClient {
         this();
         for(String authName : authNames) {
             {{#hasAuthMethods}}
-            Interceptor auth;
+            Interceptor auth = null;
             {{#authMethods}}if ("{{name}}".equals(authName)) {
             {{#is this 'basic'}}
                 auth = new HttpBasicAuth();

src/main/resources/handlebars/Java/libraries/retrofit2/ApiClient.mustache

@@ -61,7 +61,7 @@ public class ApiClient {
     this();
     for(String authName : authNames) {
       {{#hasAuthMethods}}
-      Interceptor auth;
+      Interceptor auth = null;
       {{#authMethods}}if ("{{name}}".equals(authName)) {
         {{#is this 'basic'}}
         auth = new HttpBasicAuth();

src/main/resources/handlebars/Java/modelEnum.mustache

@@ -52,7 +52,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
     }
     {{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + text + "' for '{{{classname}}}' enum.");{{/errorOnUnknownEnum}}
   }
-{{#if gson}}
+{{#gson}}
 
   public static class Adapter extends TypeAdapter<{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> {
     @Override
@@ -63,8 +63,8 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
     @Override
     public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
       Object value = {{#isNumber}}new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}nextString(){{/isInteger}}{{/isNumber}};
-      return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(({{{datatype}}})(value));
+      return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(({{{dataType}}})(value));
     }
   }
-{{/if}}
+{{/gson}}
 }

src/main/resources/handlebars/JavaSpring/interface.mustache

@@ -1,6 +1,21 @@
+{{#jackson}}
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+{{/jackson}}
 /**
 * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
 */
+{{#jackson}}
+@JsonTypeInfo(
+  use = JsonTypeInfo.Id.NAME,
+  include = JsonTypeInfo.As.PROPERTY,
+  property = "type")
+@JsonSubTypes({
+  {{#subTypes}}
+  @JsonSubTypes.Type(value = {{classname}}.class, name = "{{classname}}"){{^@last}},{{/@last}}
+  {{/subTypes}}
+})
+{{/jackson}}
 public interface {{{classname}}} {
 
 }