Merge pull request #11301 from swagger-api/java-generator-sample-update

updated java client samples

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenModel.java

@@ -176,7 +176,6 @@ public int hashCode() {
         result = 31 * result + (parentSchema != null ? parentSchema.hashCode() : 0);
         result = 31 * result + (interfaces != null ? interfaces.hashCode() : 0);
         result = 31 * result + (parentModel != null ? parentModel.hashCode() : 0);
-        result = 31 * result + (subTypes != null ? subTypes.hashCode() : 0);
         result = 31 * result + (interfaceModels != null ? interfaceModels.hashCode() : 0);
         result = 31 * result + (name != null ? name.hashCode() : 0);
         result = 31 * result + (classname != null ? classname.hashCode() : 0);

samples/client/petstore/java/feign/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.28-SNAPSHOT
+3.0.31-SNAPSHOT

samples/client/petstore/java/feign/build.gradle

@@ -96,7 +96,6 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "2.0.0"
     jackson_version = "2.10.1"
-    threepane_version = "2.6.4"
     feign_version = "9.4.0"
     feign_form_version = "2.1.0"
     junit_version = "4.12"
@@ -113,7 +112,6 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"

samples/client/petstore/java/feign/pom.xml

@@ -117,7 +117,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.4</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -217,11 +217,6 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.github.joschi.jackson</groupId>
-      <artifactId>jackson-datatype-threetenbp</artifactId>
-      <version>${jackson-threetenbp-version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
@@ -256,7 +251,6 @@
     <feign-version>11.6</feign-version>
     <feign-form-version>3.8.0</feign-form-version>
     <jackson-version>2.10.1</jackson-version>
-    <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
     <junit-version>4.13.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.2</oltu-version>

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

@@ -5,13 +5,11 @@
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
-import org.threeten.bp.*;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 
 import feign.Feign;
 import feign.RequestInterceptor;
@@ -42,7 +40,7 @@ public ApiClient() {
   public ApiClient(String[] authNames) {
     this();
     for(String authName : authNames) {
-      RequestInterceptor auth;
+      RequestInterceptor auth = null;
       if ("api_key".equals(authName)) {
         auth = new ApiKeyAuth("header", "api_key");
       } else if ("api_key_query".equals(authName)) {
@@ -139,11 +137,6 @@ private ObjectMapper createObjectMapper() {
     objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
     objectMapper.setDateFormat(new RFC3339DateFormat());
     objectMapper.registerModule(new JavaTimeModule());
-    ThreeTenModule module = new ThreeTenModule();
-    module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
-    module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
-    module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
-    objectMapper.registerModule(module);
     return objectMapper;
   }
 

samples/client/petstore/java/feign/src/main/java/io/swagger/client/CustomInstantDeserializer.java

@@ -48,9 +48,9 @@ public String toString() {
       return String.valueOf(value);
     }
     @JsonCreator
-    public static JustSymbolEnum fromValue(String text) {
+    public static JustSymbolEnum fromValue(String input) {
       for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (b.value.equals(input)) {
           return b;
         }
       }
@@ -82,9 +82,9 @@ public String toString() {
       return String.valueOf(value);
     }
     @JsonCreator
-    public static ArrayEnumEnum fromValue(String text) {
+    public static ArrayEnumEnum fromValue(String input) {
       for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (b.value.equals(input)) {
           return b;
         }
       }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -42,9 +42,9 @@ public String toString() {
   }
 
   @JsonCreator
-  public static EnumClass fromValue(String text) {
+  public static EnumClass fromValue(String input) {
     for (EnumClass b : EnumClass.values()) {
-      if (String.valueOf(b.value).equals(text)) {
+      if (b.value.equals(input)) {
         return b;
       }
     }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java

@@ -48,9 +48,9 @@ public String toString() {
       return String.valueOf(value);
     }
     @JsonCreator
-    public static EnumFormStringArrayEnum fromValue(String text) {
+    public static EnumFormStringArrayEnum fromValue(String input) {
       for (EnumFormStringArrayEnum b : EnumFormStringArrayEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (b.value.equals(input)) {
           return b;
         }
       }
@@ -83,9 +83,9 @@ public String toString() {
       return String.valueOf(value);
     }
     @JsonCreator
-    public static EnumFormStringEnum fromValue(String text) {
+    public static EnumFormStringEnum fromValue(String input) {
       for (EnumFormStringEnum b : EnumFormStringEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (b.value.equals(input)) {
           return b;
         }
       }
@@ -117,9 +117,9 @@ public String toString() {
       return String.valueOf(value);
     }
     @JsonCreator
-    public static EnumQueryDoubleEnum fromValue(String text) {
+    public static EnumQueryDoubleEnum fromValue(Double input) {
       for (EnumQueryDoubleEnum b : EnumQueryDoubleEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (b.value.equals(input)) {
           return b;
         }
       }