From 4c674ca94b83188692b0f9975142cf4f7295a5f9 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Sun, 26 Oct 2014 21:46:26 -0700
Subject: [PATCH] rebuilt samples

---
 .../java/com/wordnik/client/api/PetApi.java   |  76 +-
 .../java/com/wordnik/client/api/StoreApi.java |  30 +-
 .../java/com/wordnik/client/api/UserApi.java  |  42 +-
 .../java/com/wordnik/client/model/Order.java  |  18 +-
 .../java/com/wordnik/client/model/Pet.java    |  11 +-
 .../java/com/wordnik/client/model/Tag.java    |   4 +-
 .../java/com/wordnik/client/model/User.java   |   3 +-
 samples/client/petstore/java/pom.xml          |  19 +-
 .../java/com/wordnik/client/ApiException.java |   2 +-
 .../java/com/wordnik/client/ApiInvoker.java   |   1 -
 .../java/com/wordnik/client/JsonUtil.java     |   1 -
 .../{petstore => client}/api/PetApi.java      | 664 ++++++++----------
 .../{petstore => client}/api/StoreApi.java    | 174 +++--
 .../{petstore => client}/api/UserApi.java     | 661 +++++++++--------
 .../{petstore => client}/model/Category.java  |  25 +-
 .../{petstore => client}/model/Order.java     |  77 +-
 .../{petstore => client}/model/Pet.java       |  53 +-
 .../{petstore => client}/model/Tag.java       |  25 +-
 .../{petstore => client}/model/User.java      |  73 +-
 .../xcshareddata/PetstoreClient.xccheckout    |  10 +-
 .../UserInterfaceState.xcuserstate            | Bin 15400 -> 19555 bytes
 .../PetstoreClient/ViewController.m           |   4 +
 .../client/petstore/objc/client/SWGPetApi.h   |   4 +-
 .../client/petstore/objc/client/SWGPetApi.m   |  45 +-
 .../client/petstore/objc/client/SWGStoreApi.m |  21 +-
 .../client/petstore/objc/client/SWGUserApi.m  |  80 ++-
 26 files changed, 1228 insertions(+), 895 deletions(-)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/api/PetApi.java (58%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/api/StoreApi.java (74%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/api/UserApi.java (82%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/model/Category.java (63%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/model/Order.java (57%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/model/Pet.java (63%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/model/Tag.java (63%)
 rename samples/client/petstore/java/src/main/java/com/wordnik/{petstore => client}/model/User.java (71%)

diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java
index 538edecb81..5aa488c757 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java
@@ -2,13 +2,19 @@ package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
-import com.wordnik.client.model.Pet;
+
+import com.wordnik.client.model.*;
 
 import java.util.*;
+
+import com.wordnik.client.model.Pet;
+
+import java.util.Map;
+import java.util.HashMap;
 import java.io.File;
 
 public class PetApi {
-  String basePath = "";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public void addHeader(String key, String value) {
@@ -30,6 +36,8 @@ public class PetApi {
   
   
   public void  updatePet (Pet body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -46,7 +54,7 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -64,7 +72,9 @@ public class PetApi {
   }
   
   
-  public void  addPet (Pet body) throws ApiException {
+  public void  addPet (Pet pet) throws ApiException {
+    Object postBody = pet;
+
     
 
     // create path and map variables
@@ -81,7 +91,7 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -100,6 +110,8 @@ public class PetApi {
   
   
   public List<Pet>  findPetsByStatus (List<String> status) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -118,7 +130,7 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
       }
@@ -137,6 +149,8 @@ public class PetApi {
   
   
   public List<Pet>  findPetsByTags (List<String> tags) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -155,7 +169,7 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
       }
@@ -174,6 +188,8 @@ public class PetApi {
   
   
   public Pet  getPetById (Long petId) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -190,7 +206,7 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (Pet) ApiInvoker.deserialize(response, "", Pet.class);
       }
@@ -208,7 +224,9 @@ public class PetApi {
   }
   
   
-  public void  deletePet (Long petId) throws ApiException {
+  public void  updatePetWithForm (String petId, String name, String status) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -225,7 +243,45 @@ public class PetApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+        return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+  
+  public void  deletePet (String api_key, Long petId) throws ApiException {
+    Object postBody = null;
+
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+
+    
+
+    headerParams.put("api_key", api_key);
+    
+
+    String contentType = "application/json";
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java
index 33edba2abd..c8f85660f7 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java
@@ -2,13 +2,19 @@ package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
-import com.wordnik.client.model.Order;
+
+import com.wordnik.client.model.*;
 
 import java.util.*;
+
+import com.wordnik.client.model.Order;
+
+import java.util.Map;
+import java.util.HashMap;
 import java.io.File;
 
 public class StoreApi {
-  String basePath = "";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public void addHeader(String key, String value) {
@@ -29,7 +35,9 @@ public class StoreApi {
 
   
   
-  public void  placeOrder (Order body) throws ApiException {
+  public Order  placeOrder (Order body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -46,16 +54,16 @@ public class StoreApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
       if(response != null){
-        return ;
+        return (Order) ApiInvoker.deserialize(response, "", Order.class);
       }
       else {
-        return ;
+        return null;
       }
     } catch (ApiException ex) {
       if(ex.getCode() == 404) {
-        return ;
+        return  null;
       }
       else {
         throw ex;
@@ -65,6 +73,8 @@ public class StoreApi {
   
   
   public Order  getOrderById (String orderId) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -81,7 +91,7 @@ public class StoreApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (Order) ApiInvoker.deserialize(response, "", Order.class);
       }
@@ -100,6 +110,8 @@ public class StoreApi {
   
   
   public void  deleteOrder (String orderId) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -116,7 +128,7 @@ public class StoreApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java
index 697455f932..5c9db1f37a 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java
@@ -2,14 +2,20 @@ package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
+
+import com.wordnik.client.model.*;
+
+import java.util.*;
+
 import com.wordnik.client.model.User;
 import java.util.*;
 
-import java.util.*;
+import java.util.Map;
+import java.util.HashMap;
 import java.io.File;
 
 public class UserApi {
-  String basePath = "";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public void addHeader(String key, String value) {
@@ -31,6 +37,8 @@ public class UserApi {
   
   
   public void  createUser (User body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -47,7 +55,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -66,6 +74,8 @@ public class UserApi {
   
   
   public void  createUsersWithArrayInput (List<User> body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -82,7 +92,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -101,6 +111,8 @@ public class UserApi {
   
   
   public void  createUsersWithListInput (List<User> body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -117,7 +129,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -136,6 +148,8 @@ public class UserApi {
   
   
   public String  loginUser (String username, String password) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -156,7 +170,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (String) ApiInvoker.deserialize(response, "", String.class);
       }
@@ -175,6 +189,8 @@ public class UserApi {
   
   
   public void  logoutUser () throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -191,7 +207,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -210,6 +226,8 @@ public class UserApi {
   
   
   public User  getUserByName (String username) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -226,7 +244,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return (User) ApiInvoker.deserialize(response, "", User.class);
       }
@@ -245,6 +263,8 @@ public class UserApi {
   
   
   public void  updateUser (String username, User body) throws ApiException {
+    Object postBody = body;
+
     
 
     // create path and map variables
@@ -261,7 +281,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
@@ -280,6 +300,8 @@ public class UserApi {
   
   
   public void  deleteUser (String username) throws ApiException {
+    Object postBody = null;
+
     
 
     // create path and map variables
@@ -296,7 +318,7 @@ public class UserApi {
     String contentType = "application/json";
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, contentType);
+      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType);
       if(response != null){
         return ;
       }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java
index 084eae46fd..65af51c2f6 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java
@@ -21,11 +21,12 @@ public class Order  {
   
   private Date shipDate = null;
   private String status = null;
+  private Boolean complete = null;
   
   
   /**
    **/
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -68,8 +69,9 @@ public class Order  {
 
   
   /**
+   * Order Status
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(required = false, value = "Order Status")
   public String getStatus() {
     return status;
   }
@@ -78,6 +80,17 @@ public class Order  {
   }
 
   
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
 
   @Override
   public String toString()  {
@@ -89,6 +102,7 @@ public class Order  {
     sb.append("  quantity: ").append(quantity).append("\n");
     sb.append("  shipDate: ").append(shipDate).append("\n");
     sb.append("  status: ").append(status).append("\n");
+    sb.append("  complete: ").append(complete).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java
index b98f2c63cc..f84c1d0d92 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java
@@ -7,10 +7,7 @@ import java.util.*;
 import com.wordnik.swagger.annotations.*;
 
 
-/**
- * A single pet in the store
- **/
-@ApiModel(description = "A single pet in the store")
+@ApiModel(description = "")
 public class Pet  { 
   private Long id = null;
   
@@ -24,9 +21,8 @@ public class Pet  {
   
   
   /**
-   * the identifier for the pet
    **/
-  @ApiModelProperty(required = false, value = "the identifier for the pet")
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -80,8 +76,9 @@ public class Pet  {
 
   
   /**
+   * pet status in the store
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(required = false, value = "pet status in the store")
   public String getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java
index 8c9101e60b..6fdc13bb04 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java
@@ -15,7 +15,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -26,7 +26,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(required = false, value = "")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java
index cf20c00067..3e1d8d032e 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java
+++ b/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java
@@ -100,8 +100,9 @@ public class User  {
 
   
   /**
+   * User Status
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(required = false, value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml
index 4561705d08..76a7f69b47 100644
--- a/samples/client/petstore/java/pom.xml
+++ b/samples/client/petstore/java/pom.xml
@@ -107,35 +107,35 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>com.wordnik</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger-annotations-version}</version>
+    </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
       <version>${jersey-version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey.contribs</groupId>
       <artifactId>jersey-multipart</artifactId>
       <version>${jersey-version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson-version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
       <version>${jackson-version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${jackson-version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -146,7 +146,6 @@
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
       <version>${jodatime-version}</version>
-      <scope>compile</scope>
     </dependency>
 
     <!-- test dependencies -->
@@ -157,8 +156,14 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </repository>
+  </repositories>
   <properties>
+    <swagger-annotations-version>1.5.0-SNAPSHOT</swagger-annotations-version>
     <jersey-version>1.7</jersey-version>
     <jackson-version>2.1.4</jackson-version>
     <jodatime-version>2.3</jodatime-version>
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java
index a0131b5cf8..9a1f62b306 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java
@@ -26,4 +26,4 @@ public class ApiException extends Exception {
   public void setMessage(String message) {
     this.message = message;
   }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
index 7843d0a512..cd6a73937b 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
@@ -185,4 +185,3 @@ public class ApiInvoker {
     return hostMap.get(host);
   }
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/client/JsonUtil.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/JsonUtil.java
index da0fca7816..a650c968f4 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/client/JsonUtil.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/JsonUtil.java
@@ -21,4 +21,3 @@ public class JsonUtil {
 		return mapper;
 	}
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/PetApi.java
similarity index 58%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/api/PetApi.java
index 5331ebfac9..2f42f96fb9 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/PetApi.java
@@ -1,276 +1,44 @@
-package com.wordnik.petstore.api;
+package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
 
-import com.wordnik.petstore.model.Pet;
+import com.wordnik.client.model.*;
+
+import java.util.*;
+
+import com.wordnik.client.model.Pet;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
 
 import javax.ws.rs.core.MediaType;
 
 import java.io.File;
-import java.util.*;
+import java.util.Map;
+import java.util.HashMap;
 
 public class PetApi {
-  String basePath = "http://petstore.swagger.wordnik.com/api";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public ApiInvoker getInvoker() {
     return apiInvoker;
   }
-  
+
   public void setBasePath(String basePath) {
     this.basePath = basePath;
   }
-  
+
   public String getBasePath() {
     return basePath;
   }
 
-  //error info- code: 400 reason: "Invalid ID supplied" model: <none>
-  //error info- code: 404 reason: "Pet not found" model: <none>
-  public Pet getPetById (Long petId) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(petId == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Pet) ApiInvoker.deserialize(response, "", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 405 reason: "Invalid input" model: <none>
-  public void updatePetWithForm (String petId, String name, String status) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(petId == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/x-www-form-urlencoded"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      hasFields = true;
-      mp.field("name", name, MediaType.MULTIPART_FORM_DATA_TYPE);
-      hasFields = true;
-      mp.field("status", status, MediaType.MULTIPART_FORM_DATA_TYPE);
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      formParams.put("name", name);formParams.put("status", status);}
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 400 reason: "Invalid pet value" model: <none>
-  public void deletePet (String petId) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(petId == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 400 reason: "Invalid tag value" model: <none>
-  public List<Pet> partialUpdate (String petId, Pet body) throws ApiException {
-    Object postBody = body;
-    // verify required params are set
-    if(petId == null || body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json","application/xml"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "PATCH", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "List", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 405 reason: "Invalid input" model: <none>
-  public void addPet (Pet body) throws ApiException {
-    Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json","application/xml"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 400 reason: "Invalid ID supplied" model: <none>
-  //error info- code: 404 reason: "Pet not found" model: <none>
-  //error info- code: 405 reason: "Validation exception" model: <none>
+  
+    
   public void updatePet (Pet body) throws ApiException {
     Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+    
+
     // create path and map variables
     String path = "/pet".replaceAll("\\{format\\}","json");
 
@@ -279,19 +47,26 @@ public class PetApi {
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      "application/json","application/xml"
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
-      }
+      
+    }
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType);
@@ -310,129 +85,40 @@ public class PetApi {
       }
     }
   }
-  //error info- code: 400 reason: "Invalid status value" model: <none>
-  public List<Pet> findPetsByStatus (String status) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(status == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+  
+    
+  public void addPet (Pet pet) throws ApiException {
+    Object postBody = pet;
+    
+
     // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+    String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
-    if(!"null".equals(String.valueOf(status)))
-      queryParams.put("status", String.valueOf(status));
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      "application/json","application/xml"
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "List", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
+      
     }
-  }
-  //error info- code: 400 reason: "Invalid tag value" model: <none>
-  public List<Pet> findPetsByTags (String tags) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(tags == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    if(!"null".equals(String.valueOf(tags)))
-      queryParams.put("tags", String.valueOf(tags));
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "List", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  public void uploadFile (String additionalMetadata, File file) throws ApiException {
-    Object postBody = null;
-    // create path and map variables
-    String path = "/pet/uploadImage".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "multipart/form-data"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      hasFields = true;
-      mp.field("additionalMetadata", additionalMetadata, MediaType.MULTIPART_FORM_DATA_TYPE);
-      hasFields = true;
-      mp.field("file", file, MediaType.MULTIPART_FORM_DATA_TYPE);
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      formParams.put("additionalMetadata", additionalMetadata);}
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
@@ -451,5 +137,273 @@ public class PetApi {
       }
     }
   }
-  }
+  
+    
+  public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
+    Object postBody = null;
+    
 
+    // create path and map variables
+    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    if(!"null".equals(String.valueOf(status)))
+      queryParams.put("status", String.valueOf(status));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public List<Pet> findPetsByTags (List<String> tags) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    if(!"null".equals(String.valueOf(tags)))
+      queryParams.put("tags", String.valueOf(tags));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public Pet getPetById (Long petId) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (Pet) ApiInvoker.deserialize(response, "", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void updatePetWithForm (String petId, String name, String status) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void deletePet (String api_key, Long petId) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    headerParams.put("api_key", api_key);
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+}
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/StoreApi.java
similarity index 74%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/api/StoreApi.java
index 6346fd6bd6..968d5840a7 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/StoreApi.java
@@ -1,39 +1,44 @@
-package com.wordnik.petstore.api;
+package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
 
-import com.wordnik.petstore.model.Order;
+import com.wordnik.client.model.*;
+
+import java.util.*;
+
+import com.wordnik.client.model.Order;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
 
 import javax.ws.rs.core.MediaType;
 
 import java.io.File;
-import java.util.*;
+import java.util.Map;
+import java.util.HashMap;
 
 public class StoreApi {
-  String basePath = "http://petstore.swagger.wordnik.com/api";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public ApiInvoker getInvoker() {
     return apiInvoker;
   }
-  
+
   public void setBasePath(String basePath) {
     this.basePath = basePath;
   }
-  
+
   public String getBasePath() {
     return basePath;
   }
 
-  //error info- code: 400 reason: "Invalid order" model: <none>
-  public void placeOrder (Order body) throws ApiException {
+  
+    
+  public Order placeOrder (Order body) throws ApiException {
     Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+    
+
     // create path and map variables
     String path = "/store/order".replaceAll("\\{format\\}","json");
 
@@ -42,66 +47,132 @@ public class StoreApi {
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
-      }
+      
+    }
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
       if(response != null){
-        return ;
+        return (Order) ApiInvoker.deserialize(response, "", Order.class);
       }
       else {
-        return ;
+        return null;
       }
     } catch (ApiException ex) {
       if(ex.getCode() == 404) {
-      	return ;
+      	return  null;
       }
       else {
         throw ex;
       }
     }
   }
-  //error info- code: 400 reason: "Invalid ID supplied" model: <none>
-  //error info- code: 404 reason: "Order not found" model: <none>
-  public void deleteOrder (String orderId) throws ApiException {
+  
+    
+  public Order getOrderById (String orderId) throws ApiException {
     Object postBody = null;
-    // verify required params are set
-    if(orderId == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+    
+
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (Order) ApiInvoker.deserialize(response, "", Order.class);
       }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void deleteOrder (String orderId) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
@@ -120,52 +191,5 @@ public class StoreApi {
       }
     }
   }
-  //error info- code: 400 reason: "Invalid ID supplied" model: <none>
-  //error info- code: 404 reason: "Order not found" model: <none>
-  public Order getOrderById (String orderId) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(orderId == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Order) ApiInvoker.deserialize(response, "", Order.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  }
-
+  
+}
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/UserApi.java
similarity index 82%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/api/UserApi.java
index 15c4354746..73b764f1a3 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/api/UserApi.java
@@ -1,61 +1,391 @@
-package com.wordnik.petstore.api;
+package com.wordnik.client.api;
 
 import com.wordnik.client.ApiException;
 import com.wordnik.client.ApiInvoker;
 
-import com.wordnik.petstore.model.User;
+import com.wordnik.client.model.*;
+
+import java.util.*;
+
+import com.wordnik.client.model.User;
+import java.util.*;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
 
 import javax.ws.rs.core.MediaType;
 
 import java.io.File;
-import java.util.*;
+import java.util.Map;
+import java.util.HashMap;
 
 public class UserApi {
-  String basePath = "http://petstore.swagger.wordnik.com/api";
+  String basePath = "http://petstore.swagger.wordnik.com/v2";
   ApiInvoker apiInvoker = ApiInvoker.getInstance();
 
   public ApiInvoker getInvoker() {
     return apiInvoker;
   }
-  
+
   public void setBasePath(String basePath) {
     this.basePath = basePath;
   }
-  
+
   public String getBasePath() {
     return basePath;
   }
 
-  //error info- code: 400 reason: "Invalid username supplied" model: <none>
-  //error info- code: 404 reason: "User not found" model: <none>
-  public void updateUser (String username, User body) throws ApiException {
+  
+    
+  public void createUser (User body) throws ApiException {
     Object postBody = body;
-    // verify required params are set
-    if(username == null || body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+    
+
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+    String path = "/user".replaceAll("\\{format\\}","json");
 
     // query params
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
       }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void createUsersWithArrayInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void createUsersWithListInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public String loginUser (String username, String password) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/user/login".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    if(!"null".equals(String.valueOf(username)))
+      queryParams.put("username", String.valueOf(username));
+    if(!"null".equals(String.valueOf(password)))
+      queryParams.put("password", String.valueOf(password));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (String) ApiInvoker.deserialize(response, "", String.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void logoutUser () throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/user/logout".replaceAll("\\{format\\}","json");
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return ;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public User getUserByName (String username) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
+
+    try {
+      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
+      if(response != null){
+        return (User) ApiInvoker.deserialize(response, "", User.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      if(ex.getCode() == 404) {
+      	return  null;
+      }
+      else {
+        throw ex;
+      }
+    }
+  }
+  
+    
+  public void updateUser (String username, User body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    Map<String, String> queryParams = new HashMap<String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if(contentType.startsWith("multipart/form-data")) {
+      boolean hasFields = false;
+      FormDataMultiPart mp = new FormDataMultiPart();
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      
+    }
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType);
@@ -74,35 +404,41 @@ public class UserApi {
       }
     }
   }
-  //error info- code: 400 reason: "Invalid username supplied" model: <none>
-  //error info- code: 404 reason: "User not found" model: <none>
+  
+    
   public void deleteUser (String username) throws ApiException {
     Object postBody = null;
-    // verify required params are set
-    if(username == null ) {
-       throw new ApiException(400, "missing required params");
-    }
+    
+
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
+    
+
+    
+
     String[] contentTypes = {
-      "application/json"};
+      
+    };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if(contentType.startsWith("multipart/form-data")) {
       boolean hasFields = false;
       FormDataMultiPart mp = new FormDataMultiPart();
+      
       if(hasFields)
         postBody = mp;
     }
     else {
-      }
+      
+    }
 
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
@@ -121,278 +457,5 @@ public class UserApi {
       }
     }
   }
-  //error info- code: 400 reason: "Invalid username supplied" model: <none>
-  //error info- code: 404 reason: "User not found" model: <none>
-  public User getUserByName (String username) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(username == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (User) ApiInvoker.deserialize(response, "", User.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  //error info- code: 400 reason: "Invalid username and password combination" model: <none>
-  public String loginUser (String username, String password) throws ApiException {
-    Object postBody = null;
-    // verify required params are set
-    if(username == null || password == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    if(!"null".equals(String.valueOf(username)))
-      queryParams.put("username", String.valueOf(username));
-    if(!"null".equals(String.valueOf(password)))
-      queryParams.put("password", String.valueOf(password));
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (String) ApiInvoker.deserialize(response, "", String.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return null;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  public void logoutUser () throws ApiException {
-    Object postBody = null;
-    // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  public void createUsersWithArrayInput (List<User> body) throws ApiException {
-    Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  public void createUsersWithListInput (List<User> body) throws ApiException {
-    Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  public void createUser (User body) throws ApiException {
-    Object postBody = body;
-    // verify required params are set
-    if(body == null ) {
-       throw new ApiException(400, "missing required params");
-    }
-    // create path and map variables
-    String path = "/user".replaceAll("\\{format\\}","json");
-
-    // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    String[] contentTypes = {
-      "application/json"};
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
-    }
-  }
-  }
-
+  
+}
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Category.java
similarity index 63%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/model/Category.java
index aa9303084b..5a0a18d40a 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Category.java
@@ -1,8 +1,21 @@
-package com.wordnik.petstore.model;
+package com.wordnik.client.model;
 
-public class Category {
+
+import com.wordnik.swagger.annotations.*;
+
+
+@ApiModel(description = "")
+public class Category  { 
   private Long id = null;
+  
+  //public enum idEnum {  }; 
+  
   private String name = null;
+  
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -10,6 +23,10 @@ public class Category {
     this.id = id;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getName() {
     return name;
   }
@@ -17,14 +34,16 @@ public class Category {
     this.name = name;
   }
 
+  
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Category {\n");
+    
     sb.append("  id: ").append(id).append("\n");
     sb.append("  name: ").append(name).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Order.java
similarity index 57%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/model/Order.java
index c44ea0f38c..65af51c2f6 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Order.java
@@ -1,14 +1,32 @@
-package com.wordnik.petstore.model;
+package com.wordnik.client.model;
 
 import java.util.Date;
-public class Order {
+
+import com.wordnik.swagger.annotations.*;
+
+
+@ApiModel(description = "")
+public class Order  { 
   private Long id = null;
+  
+  //public enum idEnum {  }; 
+  
   private Long petId = null;
+  
+  //public enum petIdEnum {  }; 
+  
   private Integer quantity = null;
-  /* Order Status */
-  private String status = null;
-  //public enum statusEnum { placed,  approved,  delivered, }; 
+  
+  //public enum quantityEnum {  }; 
+  
   private Date shipDate = null;
+  private String status = null;
+  private Boolean complete = null;
+  
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -16,6 +34,10 @@ public class Order {
     this.id = id;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getPetId() {
     return petId;
   }
@@ -23,6 +45,10 @@ public class Order {
     this.petId = petId;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Integer getQuantity() {
     return quantity;
   }
@@ -30,13 +56,10 @@ public class Order {
     this.quantity = quantity;
   }
 
-  public String getStatus() {
-    return status;
-  }
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Date getShipDate() {
     return shipDate;
   }
@@ -44,17 +67,43 @@ public class Order {
     this.shipDate = shipDate;
   }
 
+  
+  /**
+   * Order Status
+   **/
+  @ApiModelProperty(required = false, value = "Order Status")
+  public String getStatus() {
+    return status;
+  }
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Order {\n");
+    
     sb.append("  id: ").append(id).append("\n");
     sb.append("  petId: ").append(petId).append("\n");
     sb.append("  quantity: ").append(quantity).append("\n");
-    sb.append("  status: ").append(status).append("\n");
     sb.append("  shipDate: ").append(shipDate).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  complete: ").append(complete).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Pet.java
similarity index 63%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/model/Pet.java
index b5a577d1a8..f84c1d0d92 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Pet.java
@@ -1,18 +1,28 @@
-package com.wordnik.petstore.model;
+package com.wordnik.client.model;
 
+import com.wordnik.client.model.Category;
+import com.wordnik.client.model.Tag;
 import java.util.*;
-import com.wordnik.petstore.model.Category;
-import com.wordnik.petstore.model.Tag;
-public class Pet {
-  /* unique identifier for the pet */
+
+import com.wordnik.swagger.annotations.*;
+
+
+@ApiModel(description = "")
+public class Pet  { 
   private Long id = null;
+  
+  //public enum idEnum {  }; 
+  
   private Category category = null;
   private String name = null;
-  private List<String> photoUrls = new ArrayList<String>();
-  private List<Tag> tags = new ArrayList<Tag>();
-  /* pet status in the store */
+  private List<String> photoUrls = new ArrayList<String>() ;
+  private List<Tag> tags = new ArrayList<Tag>() ;
   private String status = null;
-  //public enum statusEnum { available, pending, sold, }; 
+  
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -20,6 +30,10 @@ public class Pet {
     this.id = id;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Category getCategory() {
     return category;
   }
@@ -27,6 +41,10 @@ public class Pet {
     this.category = category;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
   }
@@ -34,6 +52,10 @@ public class Pet {
     this.name = name;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -41,6 +63,10 @@ public class Pet {
     this.photoUrls = photoUrls;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public List<Tag> getTags() {
     return tags;
   }
@@ -48,6 +74,11 @@ public class Pet {
     this.tags = tags;
   }
 
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(required = false, value = "pet status in the store")
   public String getStatus() {
     return status;
   }
@@ -55,10 +86,13 @@ public class Pet {
     this.status = status;
   }
 
+  
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Pet {\n");
+    
     sb.append("  id: ").append(id).append("\n");
     sb.append("  category: ").append(category).append("\n");
     sb.append("  name: ").append(name).append("\n");
@@ -69,4 +103,3 @@ public class Pet {
     return sb.toString();
   }
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Tag.java
similarity index 63%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/model/Tag.java
index 886a5a6513..6fdc13bb04 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/Tag.java
@@ -1,8 +1,21 @@
-package com.wordnik.petstore.model;
+package com.wordnik.client.model;
 
-public class Tag {
+
+import com.wordnik.swagger.annotations.*;
+
+
+@ApiModel(description = "")
+public class Tag  { 
   private Long id = null;
+  
+  //public enum idEnum {  }; 
+  
   private String name = null;
+  
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -10,6 +23,10 @@ public class Tag {
     this.id = id;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getName() {
     return name;
   }
@@ -17,14 +34,16 @@ public class Tag {
     this.name = name;
   }
 
+  
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Tag {\n");
+    
     sb.append("  id: ").append(id).append("\n");
     sb.append("  name: ").append(name).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
 }
-
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/User.java
similarity index 71%
rename from samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
rename to samples/client/petstore/java/src/main/java/com/wordnik/client/model/User.java
index 4b28758add..3e1d8d032e 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/model/User.java
@@ -1,16 +1,30 @@
-package com.wordnik.petstore.model;
+package com.wordnik.client.model;
 
-public class User {
+
+import com.wordnik.swagger.annotations.*;
+
+
+@ApiModel(description = "")
+public class User  { 
   private Long id = null;
-  private String firstName = null;
+  
+  //public enum idEnum {  }; 
+  
   private String username = null;
+  private String firstName = null;
   private String lastName = null;
   private String email = null;
   private String password = null;
   private String phone = null;
-  /* User Status */
   private Integer userStatus = null;
-  //public enum userStatusEnum { 1-registered, 2-active, 3-closed, }; 
+  
+  //public enum userStatusEnum {  }; 
+  
+  
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public Long getId() {
     return id;
   }
@@ -18,13 +32,10 @@ public class User {
     this.id = id;
   }
 
-  public String getFirstName() {
-    return firstName;
-  }
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getUsername() {
     return username;
   }
@@ -32,6 +43,21 @@ public class User {
     this.username = username;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getLastName() {
     return lastName;
   }
@@ -39,6 +65,10 @@ public class User {
     this.lastName = lastName;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getEmail() {
     return email;
   }
@@ -46,6 +76,10 @@ public class User {
     this.email = email;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getPassword() {
     return password;
   }
@@ -53,6 +87,10 @@ public class User {
     this.password = password;
   }
 
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
   public String getPhone() {
     return phone;
   }
@@ -60,6 +98,11 @@ public class User {
     this.phone = phone;
   }
 
+  
+  /**
+   * User Status
+   **/
+  @ApiModelProperty(required = false, value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
   }
@@ -67,13 +110,16 @@ public class User {
     this.userStatus = userStatus;
   }
 
+  
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class User {\n");
+    
     sb.append("  id: ").append(id).append("\n");
-    sb.append("  firstName: ").append(firstName).append("\n");
     sb.append("  username: ").append(username).append("\n");
+    sb.append("  firstName: ").append(firstName).append("\n");
     sb.append("  lastName: ").append(lastName).append("\n");
     sb.append("  email: ").append(email).append("\n");
     sb.append("  password: ").append(password).append("\n");
@@ -83,4 +129,3 @@ public class User {
     return sb.toString();
   }
 }
-
diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout b/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout
index 66f3c15bca..fafd21fb8e 100644
--- a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout
+++ b/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout
@@ -10,29 +10,29 @@
 	<string>PetstoreClient</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>92840518-904D-4771-AA3D-9AF52CA48B71</key>
+		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
 		<string>ssh://github.com/wordnik/swagger-codegen.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>samples/client/petstore/objc/PetstoreClient.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>92840518-904D-4771-AA3D-9AF52CA48B71</key>
+		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
 		<string>../../../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>ssh://github.com/wordnik/swagger-codegen.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>92840518-904D-4771-AA3D-9AF52CA48B71</string>
+	<string>E5BBF0AA85077C865C95437976D06D819733A208</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>92840518-904D-4771-AA3D-9AF52CA48B71</string>
+			<string>E5BBF0AA85077C865C95437976D06D819733A208</string>
 			<key>IDESourceControlWCCName</key>
 			<string>swagger-codegen</string>
 		</dict>
diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate
index 86db4ca5035c954f237bd14307c8e615c2ce6c8b..6ff18c077e2187f0273e9af773d658acd64ae754 100644
GIT binary patch
literal 19555
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
CANKPA

delta 8700
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
Izf-3FA7bzqdjJ3c

diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
index d8e593c507..1af289ecee 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
+++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
@@ -24,6 +24,10 @@
     
     [api getPetByIdWithCompletionBlock:@10 completionHandler:^(SWGPet *output, NSError *error) {
         NSLog(@"%@", [output asDictionary]);
+        [output set_id:@101];
+        [api addPetWithCompletionBlock:output completionHandler:^(NSError *error) {
+            NSLog(@"Done!");
+        }];
     }];
 }
 
diff --git a/samples/client/petstore/objc/client/SWGPetApi.h b/samples/client/petstore/objc/client/SWGPetApi.h
index 373f1c6448..5a79b72c36 100644
--- a/samples/client/petstore/objc/client/SWGPetApi.h
+++ b/samples/client/petstore/objc/client/SWGPetApi.h
@@ -25,10 +25,10 @@
  Add a new pet to the store
  
 
- @param body Pet object that needs to be added to the store
+ @param pet Pet object that needs to be added to the store
  
  */
--(NSNumber*) addPetWithCompletionBlock : (SWGPet*) body
+-(NSNumber*) addPetWithCompletionBlock : (SWGPet*) pet
 
     completionHandler: (void (^)(NSError* error))completionBlock;
 /**
diff --git a/samples/client/petstore/objc/client/SWGPetApi.m b/samples/client/petstore/objc/client/SWGPetApi.m
index 1ae7436917..df590fcde3 100644
--- a/samples/client/petstore/objc/client/SWGPetApi.m
+++ b/samples/client/petstore/objc/client/SWGPetApi.m
@@ -54,6 +54,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath];
 
     // remove format in URL if needed
@@ -72,9 +73,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -84,25 +85,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -136,10 +137,11 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
 }
 
--(NSNumber*) addPetWithCompletionBlock:(SWGPet*) body        
+-(NSNumber*) addPetWithCompletionBlock:(SWGPet*) pet        
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = pet;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath];
 
     // remove format in URL if needed
@@ -158,9 +160,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -170,25 +172,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -226,6 +228,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByStatus", basePath];
 
     // remove format in URL if needed
@@ -291,6 +294,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByTags", basePath];
 
     // remove format in URL if needed
@@ -356,6 +360,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath];
 
     // remove format in URL if needed
@@ -416,6 +421,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath];
 
     // remove format in URL if needed
@@ -470,6 +476,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", basePath];
 
     // remove format in URL if needed
diff --git a/samples/client/petstore/objc/client/SWGStoreApi.m b/samples/client/petstore/objc/client/SWGStoreApi.m
index 30e2ba6d70..35714fae6c 100644
--- a/samples/client/petstore/objc/client/SWGStoreApi.m
+++ b/samples/client/petstore/objc/client/SWGStoreApi.m
@@ -54,6 +54,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock
          {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order", basePath];
 
     // remove format in URL if needed
@@ -72,9 +73,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -84,25 +85,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -145,6 +146,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath];
 
     // remove format in URL if needed
@@ -203,6 +205,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", basePath];
 
     // remove format in URL if needed
diff --git a/samples/client/petstore/objc/client/SWGUserApi.m b/samples/client/petstore/objc/client/SWGUserApi.m
index 34d2301553..8c0e817ad5 100644
--- a/samples/client/petstore/objc/client/SWGUserApi.m
+++ b/samples/client/petstore/objc/client/SWGUserApi.m
@@ -54,6 +54,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user", basePath];
 
     // remove format in URL if needed
@@ -72,9 +73,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -84,25 +85,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -140,6 +141,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithArray", basePath];
 
     // remove format in URL if needed
@@ -158,9 +160,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -170,25 +172,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -226,6 +228,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithList", basePath];
 
     // remove format in URL if needed
@@ -244,9 +247,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -256,25 +259,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -313,6 +316,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(NSString* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/login", basePath];
 
     // remove format in URL if needed
@@ -367,6 +371,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         (void (^)(NSError* error))completionBlock {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/logout", basePath];
 
     // remove format in URL if needed
@@ -419,6 +424,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock
          {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath];
 
     // remove format in URL if needed
@@ -478,6 +484,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = body;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath];
 
     // remove format in URL if needed
@@ -497,9 +504,9 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
 
     id bodyDictionary = nil;
     
-    if(body != nil && [body isKindOfClass:[NSArray class]]){
+    if(m_body != nil && [m_body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
+        for (id dict in (NSArray*)m_body) {
             if([dict respondsToSelector:@selector(asDictionary)]) {
                 [objs addObject:[(SWGObject*)dict asDictionary]];
             }
@@ -509,25 +516,25 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         }
         bodyDictionary = objs;
     }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
+    else if([m_body respondsToSelector:@selector(asDictionary)]) {
+        bodyDictionary = [(SWGObject*)m_body asDictionary];
     }
-    else if([body isKindOfClass:[NSString class]]) {
+    else if([m_body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
         NSError * error;
-        NSString * str = (NSString*)body;
+        NSString * str = (NSString*)m_body;
         NSDictionary *JSON =
             [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
                                             options:NSJSONReadingMutableContainers
                                               error:&error];
         bodyDictionary = JSON;
     }
-    else if([body isKindOfClass: [SWGFile class]]) {
+    else if([m_body isKindOfClass: [SWGFile class]]) {
         requestContentType = @"form-data";
-        bodyDictionary = body;
+        bodyDictionary = m_body;
     }
     else{
-        NSLog(@"don't know what to do with %@", body);
+        NSLog(@"don't know what to do with %@", m_body);
     }
 
     
@@ -565,6 +572,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/v2";
         
         completionHandler: (void (^)(NSError* error))completionBlock {
 
+    id m_body = nil;
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{username}", basePath];
 
     // remove format in URL if needed