Merge remote-tracking branch 'origin/master' into 230_merge_master

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

@@ -0,0 +1 @@
+2.3.0-SNAPSHOT

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java

@@ -180,4 +180,17 @@ public interface FakeApi extends ApiClient.Api {
       return this;
     }
   }
+
+  /**
+   * test json serialization of form data
+   * 
+    * @param param field1 (required)
+    * @param param2 field2 (required)
+   */
+  @RequestLine("GET /fake/jsonFormData")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testJsonFormData(@Param("param") String param, @Param("param2") String param2);
 }

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

@@ -41,12 +41,12 @@ public class EnumArrays {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
@@ -79,12 +79,12 @@ public class EnumArrays {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }

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

@@ -35,12 +35,12 @@ public enum EnumClass {
     this.value = value;
   }
 
+  @JsonValue
   public String getValue() {
     return value;
   }
 
   @Override
-  @JsonValue
   public String toString() {
     return String.valueOf(value);
   }

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

@@ -42,12 +42,12 @@ public class EnumTest {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
@@ -80,12 +80,12 @@ public class EnumTest {
       this.value = value;
     }
 
+    @JsonValue
     public Integer getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
@@ -118,12 +118,12 @@ public class EnumTest {
       this.value = value;
     }
 
+    @JsonValue
     public Double getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }

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

@@ -45,12 +45,12 @@ public class MapTest {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }

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

@@ -54,12 +54,12 @@ public class Order {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }

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

@@ -35,12 +35,12 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  @JsonValue
   public String getValue() {
     return value;
   }
 
   @Override
-  @JsonValue
   public String toString() {
     return String.valueOf(value);
   }

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

@@ -60,12 +60,12 @@ public class Pet {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }