diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java b/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
index 0c5ef6f1eda..d0be1523e45 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
@@ -48,7 +48,7 @@ public class PetstoreProfiling {
 
             /* UPDATE PET WITH FORM */
             start = System.nanoTime();
-            petApi.updatePetWithForm(String.valueOf(newPetId), "new profiler", "sold");
+            petApi.updatePetWithForm(newPetId, "new profiler", "sold");
             results.add(buildResult(index, "UPDATE PET", System.nanoTime() - start));
 
             /* DELETE PET */
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
index ad971ea6669..9e927a69ba2 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -73,6 +73,7 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    /*
     @Test
     public void testCreateAndGetPetWithByteArray() throws Exception {
         Pet pet = createRandomPet();
@@ -119,6 +120,7 @@ public class PetApiTest {
         assertEquals(category.getId(), Long.valueOf(categoryIdInt));
         assertEquals(category.getName(), categoryMap.get("name"));
     }
+    */
 
     @Test
     public void testUpdatePet() throws Exception {
@@ -191,7 +193,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId());
 
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        api.updatePetWithForm(fetched.getId(), "furt", null);
         Pet updated = api.getPetById(fetched.getId());
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 403f9b64ec9..4b33d380f14 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -35,6 +35,7 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    /*
     @Test
     public void testGetInventoryInObject() throws Exception {
         Object inventoryObj = api.getInventoryInObject();
@@ -47,13 +48,14 @@ public class StoreApiTest {
         assertTrue(firstEntry.getKey() instanceof String);
         assertTrue(firstEntry.getValue() instanceof Integer);
     }
+    */
 
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -64,13 +66,13 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(String.valueOf(order.getId()));
 
         try {
-            api.getOrderById(String.valueOf(order.getId()));
+            api.getOrderById(order.getId());
             // fail("expected an error");
         } catch (ApiException e) {
             // ok
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
index bf068652905..a2e8c34d95e 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -120,7 +120,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId());
 
-        api.updatePetWithForm(fetched.getId().toString(), "furt", null);
+        api.updatePetWithForm(fetched.getId(), "furt", null);
         Pet updated = api.getPetById(fetched.getId());
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 32dcd6d0c0e..ca14be28a80 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -35,7 +35,7 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(order.getId().toString());
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -46,13 +46,13 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(order.getId().toString());
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(order.getId().toString());
 
         try {
-            api.getOrderById(order.getId().toString());
+            api.getOrderById(order.getId());
             fail("expected an error");
         } catch (FeignException e) {
             assertTrue(e.getMessage().startsWith("status 404 "));
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 9af7c537877..51583853257 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -70,6 +70,7 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    /*
     @Test
     public void testCreateAndGetPetWithByteArray() throws Exception {
         Pet pet = createRandomPet();
@@ -116,6 +117,7 @@ public class PetApiTest {
         assertEquals(category.getId(), Long.valueOf(categoryIdInt));
         assertEquals(category.getName(), categoryMap.get("name"));
     }
+    */
 
     @Test
     public void testUpdatePet() throws Exception {
@@ -188,7 +190,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId());
 
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        api.updatePetWithForm(fetched.getId(), "furt", null);
         Pet updated = api.getPetById(fetched.getId());
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index b0106d2f4c6..7ccbdf3f32b 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -33,6 +33,7 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    /*
     @Test
     public void testGetInventoryInObject() throws Exception {
         Object inventoryObj = api.getInventoryInObject();
@@ -45,13 +46,14 @@ public class StoreApiTest {
         assertTrue(firstEntry.getKey() instanceof String);
         assertTrue(firstEntry.getValue() instanceof Integer);
     }
+    */
 
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -62,13 +64,13 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(String.valueOf(order.getId()));
 
         try {
-            api.getOrderById(String.valueOf(order.getId()));
+            api.getOrderById(order.getId());
             // fail("expected an error");
         } catch (ApiException e) {
             // ok
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
index 000dbd96bfb..5345e2a1646 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
@@ -150,6 +150,7 @@ public class ApiClientTest {
         }
     }
 
+    /*
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;
@@ -171,6 +172,7 @@ public class ApiClientTest {
         auth.setUsername(null);
         auth.setPassword(null);
     }
+    */
 
     @Test
     public void testSetApiKeyAndPrefix() {
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 97e708fb2ec..e378356d0d4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -72,6 +72,7 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    /*
     @Test
     public void testCreateAndGetPetWithByteArray() throws Exception {
         Pet pet = createRandomPet();
@@ -86,6 +87,7 @@ public class PetApiTest {
         assertNotNull(fetched.getCategory());
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
+    */
 
     @Test
     public void testCreateAndGetPetWithHttpInfo() throws Exception {
@@ -197,6 +199,7 @@ public class PetApiTest {
         assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
     }
 
+    /*
     @Test
     public void testGetPetByIdInObject() throws Exception {
         Pet pet = new Pet();
@@ -230,6 +233,7 @@ public class PetApiTest {
         assertEquals(category.getId(), categoryIdLong);
         assertEquals(category.getName(), categoryMap.get("name"));
     }
+    */
 
     @Test
     public void testUpdatePet() throws Exception {
@@ -306,7 +310,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId());
 
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        api.updatePetWithForm(fetched.getId(), "furt", null);
         Pet updated = api.getPetById(fetched.getId());
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 2f4c4297250..0d1910dc1e7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -38,6 +38,7 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    /*
     @Test
     public void testGetInventoryInObject() throws Exception {
         Object inventoryObj = api.getInventoryInObject();
@@ -51,13 +52,14 @@ public class StoreApiTest {
         // NOTE: Gson parses integer value to double.
         assertTrue(firstEntry.getValue() instanceof Double);
     }
+    */
 
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -68,13 +70,13 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(String.valueOf(order.getId()));
 
         try {
-            api.getOrderById(String.valueOf(order.getId()));
+            api.getOrderById(order.getId());
             // fail("expected an error");
         } catch (ApiException e) {
             // ok
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
index a943a8ffe6e..9fa93650d54 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -2,7 +2,8 @@ package io.swagger.petstore.test;
 
 import io.swagger.TestUtils;
 
-import io.swagger.client.ApiClient;
+import io.swagger.client.*;
+import io.swagger.client.CollectionFormats.*;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
@@ -61,7 +62,7 @@ public class PetApiTest {
 
         api.updatePet(pet);
 
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        List<Pet> pets = api.findPetsByStatus(new CSVParams("available"));
         assertNotNull(pets);
 
         boolean found = false;
@@ -89,7 +90,7 @@ public class PetApiTest {
 
         api.updatePet(pet);
 
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        List<Pet> pets = api.findPetsByTags(new CSVParams("friendly"));
         assertNotNull(pets);
 
         boolean found = false;
@@ -110,7 +111,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId());
 
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        api.updatePetWithForm(fetched.getId(), "furt", null);
         Pet updated = api.getPetById(fetched.getId());
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 07d3b6a298d..c823245355a 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -33,7 +33,7 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -44,13 +44,13 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order);
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
+        Order fetched = api.getOrderById(order.getId());
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(String.valueOf(order.getId()));
 
         try {
-            api.getOrderById(String.valueOf(order.getId()));
+            api.getOrderById(order.getId());
             // fail("expected an error");
         } catch (RetrofitError e) {
             // ok
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 3905fb962e3..ac8abefb216 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -3,6 +3,7 @@ package io.swagger.petstore.test;
 import io.swagger.TestUtils;
 
 import io.swagger.client.ApiClient;
+import io.swagger.client.CollectionFormats.*;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
@@ -65,7 +66,7 @@ public class PetApiTest {
 
         api.updatePet(pet).execute();
 
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"})).execute().body();
+        List<Pet> pets = api.findPetsByStatus(new CSVParams("available")).execute().body();
         assertNotNull(pets);
 
         boolean found = false;
@@ -93,7 +94,7 @@ public class PetApiTest {
 
         api.updatePet(pet).execute();
 
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"})).execute().body();
+        List<Pet> pets = api.findPetsByTags(new CSVParams("friendly")).execute().body();
         assertNotNull(pets);
 
         boolean found = false;
@@ -114,7 +115,7 @@ public class PetApiTest {
 
         Pet fetched = api.getPetById(pet.getId()).execute().body();
 
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null).execute();
+        api.updatePetWithForm(fetched.getId(), "furt", null).execute();
         Pet updated = api.getPetById(fetched.getId()).execute().body();
 
         assertEquals(updated.getName(), "furt");
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index bda483d3fd4..249d5dc4828 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -33,7 +33,7 @@ public class StoreApiTest {
         Order order = createOrder();
         api.placeOrder(order).execute();
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId())).execute().body();
+        Order fetched = api.getOrderById(order.getId()).execute().body();
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
@@ -44,12 +44,12 @@ public class StoreApiTest {
         Order order = createOrder();
         Response<Order> aa = api.placeOrder(order).execute();
 
-        Order fetched = api.getOrderById(String.valueOf(order.getId())).execute().body();
+        Order fetched = api.getOrderById(order.getId()).execute().body();
         assertEquals(fetched.getId(), order.getId());
 
         api.deleteOrder(String.valueOf(order.getId())).execute();
 
-        api.getOrderById(String.valueOf(order.getId())).execute();
+        api.getOrderById(order.getId()).execute();
         //also in retrofit 1 should return an error but don't, check server api impl.
     }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java
index a433321a0f9..1c8448da5cc 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,6 +1,7 @@
 package io.swagger.petstore.test;
 
 import io.swagger.client.ApiClient;
+import io.swagger.client.CollectionFormats.*;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
@@ -79,7 +80,7 @@ public class PetApiTest {
         api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
             @Override
             public void onCompleted() {
-                api.findPetsByStatus(Arrays.asList(new String[]{"available"})).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                api.findPetsByStatus(new CSVParams("available")).subscribe(new SkeletonSubscriber<List<Pet>>() {
                     @Override
                     public void onNext(List<Pet> pets) {
                         assertNotNull(pets);
@@ -116,7 +117,7 @@ public class PetApiTest {
         api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
             @Override
             public void onCompleted() {
-                api.findPetsByTags(Arrays.asList(new String[]{"friendly"})).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                api.findPetsByTags(new CSVParams("friendly")).subscribe(new SkeletonSubscriber<List<Pet>>() {
                     @Override
                     public void onNext(List<Pet> pets) {
                         assertNotNull(pets);
@@ -145,7 +146,7 @@ public class PetApiTest {
         api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
             @Override
             public void onNext(final Pet fetched) {
-                api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null)
+                api.updatePetWithForm(fetched.getId(), "furt", null)
                         .subscribe(new SkeletonSubscriber<Void>() {
                             @Override
                             public void onCompleted() {
@@ -201,7 +202,7 @@ public class PetApiTest {
         api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
 
         RequestBody body = RequestBody.create(MediaType.parse("text/plain"), file);
-        api.uploadFile(pet.getId(), "a test file", body).subscribe(new SkeletonSubscriber<Void>() {
+        api.uploadFile(pet.getId(), "a test file", body).subscribe(new SkeletonSubscriber<ApiResponse>() {
             @Override
             public void onError(Throwable e) {
                 // this also yields a 400 for other tests, so I guess it's okay...
@@ -251,4 +252,4 @@ public class PetApiTest {
 
         return pet;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 39785f755ca..f5a34eab200 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -36,7 +36,7 @@ public class StoreApiTest {
     public void testPlaceOrder() throws Exception {
         final Order order = createOrder();
         api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
-        api.getOrderById(String.valueOf(order.getId())).subscribe(new SkeletonSubscriber<Order>() {
+        api.getOrderById(order.getId()).subscribe(new SkeletonSubscriber<Order>() {
             @Override
             public void onNext(Order fetched) {
                 assertEquals(order.getId(), fetched.getId());
@@ -51,7 +51,7 @@ public class StoreApiTest {
         final Order order = createOrder();
         api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
 
-        api.getOrderById(String.valueOf(order.getId())).subscribe(new SkeletonSubscriber<Order>() {
+        api.getOrderById(order.getId()).subscribe(new SkeletonSubscriber<Order>() {
             @Override
             public void onNext(Order fetched) {
                 assertEquals(fetched.getId(), order.getId());
@@ -60,7 +60,7 @@ public class StoreApiTest {
 
 
         api.deleteOrder(String.valueOf(order.getId())).subscribe(SkeletonSubscriber.failTestOnError());
-        api.getOrderById(String.valueOf(order.getId()))
+        api.getOrderById(order.getId())
                 .subscribe(new SkeletonSubscriber<Order>() {
                                @Override
                                public void onNext(Order order) {