update retrofit2 petstore samples

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/FakeApi.java

@@ -2,6 +2,8 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
+
+
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -2,6 +2,8 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
+
+
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/PetApi.java

@@ -2,6 +2,8 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
+
+
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/StoreApi.java

@@ -2,6 +2,8 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
+
+
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/UserApi.java

@@ -2,6 +2,8 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
+
+
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -43,7 +43,7 @@ public class AdditionalPropertiesClass {
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
     if (this.mapProperty == null) {
-      this.mapProperty = new HashMap<>();
+      this.mapProperty = new HashMap<String, String>();
     }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
@@ -69,7 +69,7 @@ public class AdditionalPropertiesClass {
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
     if (this.mapOfMapProperty == null) {
-      this.mapOfMapProperty = new HashMap<>();
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
     }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfArrayOfNumberOnly {
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
     if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
     }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfNumberOnly {
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
+      this.arrayNumber = new ArrayList<BigDecimal>();
     }
     this.arrayNumber.add(arrayNumberItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -46,7 +46,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
+      this.arrayOfString = new ArrayList<String>();
     }
     this.arrayOfString.add(arrayOfStringItem);
     return this;
@@ -72,7 +72,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
     if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
     }
     this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
     return this;
@@ -99,7 +99,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
     if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
     }
     this.arrayArrayOfModel.add(arrayArrayOfModelItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -130,7 +130,7 @@ public class EnumArrays {
 
   public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
     }
     this.arrayEnum.add(arrayEnumItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java

@@ -13,15 +13,18 @@
 
 package io.swagger.client.model;
 
+import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
-import java.util.Objects;
 import java.util.UUID;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 /**
  * FormatTest

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java

@@ -78,7 +78,7 @@ public class MapTest {
 
   public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
     if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
     }
     this.mapMapOfString.put(key, mapMapOfStringItem);
     return this;
@@ -105,7 +105,7 @@ public class MapTest {
 
   public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
     if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
     }
     this.mapOfEnumString.put(key, mapOfEnumStringItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -87,7 +87,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
 
   public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
     if (this.map == null) {
-      this.map = new HashMap<>();
+      this.map = new HashMap<String, Animal>();
     }
     this.map.put(key, mapItem);
     return this;

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java

@@ -41,7 +41,7 @@ public class Pet {
   private String name = null;
 
   @JsonProperty("photoUrls")
-  private List<String> photoUrls = new ArrayList<>();
+  private List<String> photoUrls = new ArrayList<String>();
 
   @JsonProperty("tags")
   private List<Tag> tags = null;
@@ -173,7 +173,7 @@ public class Pet {
 
   public Pet addTagsItem(Tag tagsItem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<>();
+      this.tags = new ArrayList<Tag>();
     }
     this.tags.add(tagsItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -43,7 +43,7 @@ public class AdditionalPropertiesClass {
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
     if (this.mapProperty == null) {
-      this.mapProperty = new HashMap<>();
+      this.mapProperty = new HashMap<String, String>();
     }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
@@ -69,7 +69,7 @@ public class AdditionalPropertiesClass {
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
     if (this.mapOfMapProperty == null) {
-      this.mapOfMapProperty = new HashMap<>();
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
     }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfArrayOfNumberOnly {
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
     if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
     }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfNumberOnly {
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
+      this.arrayNumber = new ArrayList<BigDecimal>();
     }
     this.arrayNumber.add(arrayNumberItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -46,7 +46,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
+      this.arrayOfString = new ArrayList<String>();
     }
     this.arrayOfString.add(arrayOfStringItem);
     return this;
@@ -72,7 +72,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
     if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
     }
     this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
     return this;
@@ -99,7 +99,7 @@ public class ArrayTest {
 
   public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
     if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
     }
     this.arrayArrayOfModel.add(arrayArrayOfModelItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -130,7 +130,7 @@ public class EnumArrays {
 
   public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
     }
     this.arrayEnum.add(arrayEnumItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/MapTest.java

@@ -78,7 +78,7 @@ public class MapTest {
 
   public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
     if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
     }
     this.mapMapOfString.put(key, mapMapOfStringItem);
     return this;
@@ -105,7 +105,7 @@ public class MapTest {
 
   public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
     if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
     }
     this.mapOfEnumString.put(key, mapOfEnumStringItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -87,7 +87,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
 
   public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
     if (this.map == null) {
-      this.map = new HashMap<>();
+      this.map = new HashMap<String, Animal>();
     }
     this.map.put(key, mapItem);
     return this;

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/Pet.java

@@ -41,7 +41,7 @@ public class Pet {
   private String name = null;
 
   @JsonProperty("photoUrls")
-  private List<String> photoUrls = new ArrayList<>();
+  private List<String> photoUrls = new ArrayList<String>();
 
   @JsonProperty("tags")
   private List<Tag> tags = null;
@@ -173,7 +173,7 @@ public class Pet {
 
   public Pet addTagsItem(Tag tagsItem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<>();
+      this.tags = new ArrayList<Tag>();
     }
     this.tags.add(tagsItem);
     return this;

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

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
@@ -18,7 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeApi {
   /**
    * 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeClassnameTags123Api {
   /**
    * To test class name in snake case

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
@@ -16,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface PetApi {
   /**
    * Add a new pet to the store
@@ -116,7 +116,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Call<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part okhttp3.MultipartBody.Part file
   );
 
 }

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface StoreApi {
   /**
    * Delete purchase order by ID

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface UserApi {
   /**
    * Create user

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

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
@@ -18,7 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeApi {
   /**
    * 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeClassnameTags123Api {
   /**
    * To test class name in snake case

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
@@ -16,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface PetApi {
   /**
    * Add a new pet to the store
@@ -116,7 +116,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Observable<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part okhttp3.MultipartBody.Part file
   );
 
 }

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface StoreApi {
   /**
    * Delete purchase order by ID

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface UserApi {
   /**
    * Create user

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

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
@@ -18,7 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeApi {
   /**
    * 

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface FakeClassnameTags123Api {
   /**
    * To test class name in snake case

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
@@ -16,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface PetApi {
   /**
    * Add a new pet to the store
@@ -116,7 +116,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Observable<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part okhttp3.MultipartBody.Part file
   );
 
 }

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface StoreApi {
   /**
    * Delete purchase order by ID

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;
 
@@ -14,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public interface UserApi {
   /**
    * Create user