fix retrofit2 play imports

bin/java-petstore-retrofit2-play24.sh

@@ -30,5 +30,6 @@ ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with
 
 echo "Removing files and folders under samples/client/petstore/java/retrofit2-play24/src/main"
 rm -rf samples/client/petstore/java/retrofit2-play24/src/main
+rm -rf samples/client/petstore/java/retrofit2-play24/src/test/java/io/swagger
 find samples/client/petstore/java/retrofit2-play24 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-retrofit2-play25.sh

@@ -30,5 +30,6 @@ ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with
 
 echo "Removing files and folders under samples/client/petstore/java/retrofit2-play25/src/main"
 rm -rf samples/client/petstore/java/retrofit2-play25/src/main
+rm -rf samples/client/petstore/java/retrofit2-play25/src/test/java/io/swagger
 find samples/client/petstore/java/retrofit2-play25 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags

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

@@ -8,6 +8,8 @@ import {{invokerPackage}}.CollectionFormats.*;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 {{#imports}}import {{import}};
 {{/imports}}

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

@@ -8,6 +8,8 @@ import {{invokerPackage}}.CollectionFormats.*;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 {{#imports}}import {{import}};
 {{/imports}}

samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md

@@ -320,8 +320,8 @@ Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 String string = "string_example"; // String | None
 byte[] binary = B; // byte[] | None
-LocalDate date = new LocalDate(); // LocalDate | None
-OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
+LocalDate date = LocalDate.now(); // LocalDate | None
+OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
 String password = "password_example"; // String | None
 String paramCallback = "paramCallback_example"; // String | None
 try {

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import io.swagger.client.model.Client;
 

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import io.swagger.client.model.Client;
 

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import io.swagger.client.model.Order;
 

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

@@ -8,6 +8,8 @@
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
 
 import io.swagger.client.model.User;
 

samples/client/petstore/java/retrofit2-play24/src/test/java/io/swagger/client/api/FakeApiTest.java

@@ -3,8 +3,10 @@
 import io.swagger.client.ApiClient;
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import io.swagger.client.model.OuterComposite;
+import io.swagger.client.model.User;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -25,11 +27,71 @@ public void setup() {
  api = new ApiClient().createService(FakeApi.class);
  }
 
-
  /**
- * To test \"client\" model
+ * 
  *
+ * Test serialization of outer boolean types
+ */
+ @Test
+ public void fakeOuterBooleanSerializeTest() {
+ Boolean body = null;
+ // Boolean response = api.fakeOuterBooleanSerialize(body);
+
+ // TODO: test validations
+ }
+ /**
  * 
+ *
+ * Test serialization of object with outer number type
+ */
+ @Test
+ public void fakeOuterCompositeSerializeTest() {
+ OuterComposite body = null;
+ // OuterComposite response = api.fakeOuterCompositeSerialize(body);
+
+ // TODO: test validations
+ }
+ /**
+ * 
+ *
+ * Test serialization of outer number types
+ */
+ @Test
+ public void fakeOuterNumberSerializeTest() {
+ BigDecimal body = null;
+ // BigDecimal response = api.fakeOuterNumberSerialize(body);
+
+ // TODO: test validations
+ }
+ /**
+ * 
+ *
+ * Test serialization of outer string types
+ */
+ @Test
+ public void fakeOuterStringSerializeTest() {
+ String body = null;
+ // String response = api.fakeOuterStringSerialize(body);
+
+ // TODO: test validations
+ }
+ /**
+ * 
+ *
+ * 
+ */
+ @Test
+ public void testBodyWithQueryParamsTest() {
+ User body = null;
+ String query = null;
+ // api.testBodyWithQueryParams(body, query);
+
+ // TODO: test validations
+ }
+ /**
+ * To test \"client\" model
+ *
+ * To test \"client\" model
  */
  @Test
  public void testClientModelTest() {
@@ -38,7 +100,6 @@ public void testClientModelTest() {
 
  // TODO: test validations
  }
-
  /**
  * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
  *
@@ -57,18 +118,17 @@ public void testEndpointParametersTest() {
  String string = null;
  byte[] binary = null;
  LocalDate date = null;
- DateTime dateTime = null;
+ OffsetDateTime dateTime = null;
  String password = null;
  String paramCallback = null;
- // Void response = api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+ // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
 
  // TODO: test validations
  }
-
  /**
  * To test enum parameters
  *
- * 
+ * To test enum parameters
  */
  @Test
  public void testEnumParametersTest() {
@@ -78,11 +138,35 @@ public void testEnumParametersTest() {
  String enumHeaderString = null;
  List<String> enumQueryStringArray = null;
  String enumQueryString = null;
- BigDecimal enumQueryInteger = null;
+ Integer enumQueryInteger = null;
  Double enumQueryDouble = null;
- // Void response = api.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
+ // api.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
+
+ // TODO: test validations
+ }
+ /**
+ * test inline additionalProperties
+ *
+ * 
+ */
+ @Test
+ public void testInlineAdditionalPropertiesTest() {
+ Object param = null;
+ // api.testInlineAdditionalProperties(param);
+
+ // TODO: test validations
+ }
+ /**
+ * test json serialization of form data
+ *
+ * 
+ */
+ @Test
+ public void testJsonFormDataTest() {
+ String param = null;
+ String param2 = null;
+ // api.testJsonFormData(param, param2);
 
  // TODO: test validations
  }
-
 }

samples/client/petstore/java/retrofit2-play24/src/test/java/io/swagger/client/api/FakeClassnameTags123ApiTest.java

@@ -22,11 +22,10 @@ public void setup() {
  api = new ApiClient().createService(FakeClassnameTags123Api.class);
  }
 
-
  /**
  * To test class name in snake case
  *
- * 
+ * To test class name in snake case
  */
  @Test
  public void testClassnameTest() {
@@ -35,5 +34,4 @@ public void testClassnameTest() {
 
  // TODO: test validations
  }
-
 }

samples/client/petstore/java/retrofit2-play24/src/test/java/io/swagger/client/api/PetApiTest.java

@@ -24,7 +24,6 @@ public void setup() {
  api = new ApiClient().createService(PetApi.class);
  }
 
-
  /**
  * Add a new pet to the store
  *
@@ -33,11 +32,10 @@ public void setup() {
  @Test
  public void addPetTest() {
  Pet body = null;
- // Void response = api.addPet(body);
+ // api.addPet(body);
 
  // TODO: test validations
  }
-
  /**
  * Deletes a pet
  *
@@ -47,11 +45,10 @@ public void addPetTest() {
  public void deletePetTest() {
  Long petId = null;
  String apiKey = null;
- // Void response = api.deletePet(petId, apiKey);
+ // api.deletePet(petId, apiKey);
 
  // TODO: test validations
  }
-
  /**
  * Finds Pets by status
  *
@@ -64,7 +61,6 @@ public void findPetsByStatusTest() {
 
  // TODO: test validations
  }
-
  /**
  * Finds Pets by tags
  *
@@ -77,7 +73,6 @@ public void findPetsByTagsTest() {
 
  // TODO: test validations
  }
-
  /**
  * Find pet by ID
  *
@@ -90,7 +85,6 @@ public void getPetByIdTest() {
 
  // TODO: test validations
  }
-
  /**
  * Update an existing pet
  *
@@ -99,11 +93,10 @@ public void getPetByIdTest() {
  @Test
  public void updatePetTest() {
  Pet body = null;
- // Void response = api.updatePet(body);
+ // api.updatePet(body);
 
  // TODO: test validations
  }
-
  /**
  * Updates a pet in the store with form data
  *
@@ -114,11 +107,10 @@ public void updatePetWithFormTest() {
  Long petId = null;
  String name = null;
  String status = null;
- // Void response = api.updatePetWithForm(petId, name, status);
+ // api.updatePetWithForm(petId, name, status);
 
  // TODO: test validations
  }
-
  /**
  * uploads an image
  *
@@ -133,5 +125,4 @@ public void uploadFileTest() {
 
  // TODO: test validations
  }
-
 }