updated versions

modules/swagger-codegen-cli/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-codegen/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-generator/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>

pom.xml

@@ -10,7 +10,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>

samples/client/petstore/android-java/build.gradle

@@ -7,7 +7,9 @@ jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.2.2'
+        
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        
     }
 }
 

samples/client/petstore/android-java/pom.xml

@@ -77,8 +77,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/main/java</source>
-                                src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -90,8 +89,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/test/java</source>
-                                src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -102,8 +100,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-                    <source>
+          <source>1.6</source>
-                    1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>

samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java

@@ -53,9 +53,7 @@ import com.google.gson.JsonParseException;
 
 public class ApiInvoker {
   private static ApiInvoker INSTANCE = new ApiInvoker();
-private Map
+  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-<String, String> defaultHeaderMap = new HashMap
-<String, String>();
 
   private HttpClient client = null;
 
@@ -186,10 +184,7 @@ throw new ApiException(500, e.getMessage());
     }
   }
 
-public String invokeAPI(String host, String path, String method, Map
+  public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
-<String, String> queryParams, Object body, Map
-<String, String> headerParams, Map
-<String, String> formParams, String contentType) throws ApiException {
     HttpClient client = getClient(host);
 
     StringBuilder b = new StringBuilder();
@@ -205,9 +200,7 @@ b.append(escapeString(key)).append("=").append(escapeString(value));
     }
     String url = host + path + b.toString();
 
-HashMap
+    HashMap<String, String> headers = new HashMap<String, String>();
-<String, String> headers = new HashMap
-<String, String>();
 
     for(String key : headerParams.keySet()) {
       headers.put(key, headerParams.get(key));

samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java

@@ -24,13 +24,11 @@ public static String serialize(Object obj){
     return getGson().toJson(obj);
   }
 
-public static
+  public static <T> T deserializeToList(String jsonString, Class cls){
-<T> T deserializeToList(String jsonString, Class cls){
     return getGson().fromJson(jsonString, getListTypeForDeserialization(cls));
   }
 
-    public static
+  public static <T> T deserializeToObject(String jsonString, Class cls){
-    <T> T deserializeToObject(String jsonString, Class cls){
     return getGson().fromJson(jsonString, getTypeForDeserialization(cls));
   }
 
@@ -38,38 +36,26 @@ public static
     String className = cls.getSimpleName();
     
     if ("User".equalsIgnoreCase(className)) {
-            return new TypeToken
+      return new TypeToken<List<User>>(){}.getType();
-            <List
-            <User>>(){}.getType();
     }
     
     if ("Category".equalsIgnoreCase(className)) {
-            return new TypeToken
+      return new TypeToken<List<Category>>(){}.getType();
-            <List
-            <Category>>(){}.getType();
     }
     
     if ("Pet".equalsIgnoreCase(className)) {
-            return new TypeToken
+      return new TypeToken<List<Pet>>(){}.getType();
-            <List
-            <Pet>>(){}.getType();
     }
     
     if ("Tag".equalsIgnoreCase(className)) {
-            return new TypeToken
+      return new TypeToken<List<Tag>>(){}.getType();
-            <List
-            <Tag>>(){}.getType();
     }
     
     if ("Order".equalsIgnoreCase(className)) {
-            return new TypeToken
+      return new TypeToken<List<Order>>(){}.getType();
-            <List
-            <Order>>(){}.getType();
     }
     
-        return new TypeToken
+    return new TypeToken<List<Object>>(){}.getType();
-        <List
-        <Object>>(){}.getType();
   }
 
   public static Type getTypeForDeserialization(Class cls) {
@@ -95,8 +81,7 @@ public static
       return new TypeToken<Order>(){}.getType();
     }
     
-            return new TypeToken
+    return new TypeToken<Object>(){}.getType();
-            <Object>(){}.getType();
   }
 
 };

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

@@ -52,17 +52,11 @@ import java.io.File;
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -112,17 +106,11 @@ import java.io.File;
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -172,17 +160,11 @@ import java.io.File;
     String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (status != null)
       queryParams.put("status", ApiInvoker.parameterToString(status));
@@ -234,17 +216,11 @@ import java.io.File;
     String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (tags != null)
       queryParams.put("tags", ApiInvoker.parameterToString(tags));
@@ -301,17 +277,11 @@ import java.io.File;
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -368,17 +338,11 @@ import java.io.File;
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -444,17 +408,11 @@ import java.io.File;
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -512,17 +470,11 @@ import java.io.File;
     String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

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

@@ -51,17 +51,11 @@ import java.io.File;
     String path = "/store/inventory".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -111,17 +105,11 @@ import java.io.File;
     String path = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -176,17 +164,11 @@ import java.io.File;
     String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -241,17 +223,11 @@ import java.io.File;
     String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

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

@@ -52,17 +52,11 @@ import java.io.File;
     String path = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -112,17 +106,11 @@ import java.io.File;
     String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -172,17 +160,11 @@ import java.io.File;
     String path = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -233,17 +215,11 @@ import java.io.File;
     String path = "/user/login".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (username != null)
       queryParams.put("username", ApiInvoker.parameterToString(username));
@@ -296,17 +272,11 @@ import java.io.File;
     String path = "/user/logout".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -361,17 +331,11 @@ import java.io.File;
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -427,17 +391,11 @@ import java.io.File;
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -492,17 +450,11 @@ import java.io.File;
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
-        <String, String>();
     // header params
-        Map
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String> headerParams = new HashMap
-        <String, String>();
     // form params
-        Map
+    Map<String, String> formParams = new HashMap<String, String>();
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java

@@ -48,4 +48,3 @@ import com.google.gson.annotations.SerializedName;
     return sb.toString();
   }
 }
-    

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

@@ -109,4 +109,3 @@ import com.google.gson.annotations.SerializedName;
     return sb.toString();
   }
 }
-    

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

@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import io.swagger.client.model.Tag;
 import java.util.*;
+import io.swagger.client.model.Tag;
 
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
@@ -111,4 +111,3 @@ import com.google.gson.annotations.SerializedName;
     return sb.toString();
   }
 }
-    

samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java

@@ -48,4 +48,3 @@ import com.google.gson.annotations.SerializedName;
     return sb.toString();
   }
 }
-    

samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java

@@ -133,4 +133,3 @@ import com.google.gson.annotations.SerializedName;
     return sb.toString();
   }
 }
-    

samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs

@@ -500,7 +500,7 @@ namespace IO.Swagger.Api {
       
 
       // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
+      String[] authSettings = new String[] { "petstore_auth", "api_key" };
 
       // make the HTTP request
       IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
@@ -540,7 +540,7 @@ namespace IO.Swagger.Api {
       
 
       // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
+      String[] authSettings = new String[] { "petstore_auth", "api_key" };
 
       // make the HTTP request
       IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);

samples/client/petstore/java/pom.xml

@@ -77,8 +77,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/main/java</source>
-                                src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -90,8 +89,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/test/java</source>
-                                src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -102,8 +100,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-                    <source>
+          <source>1.6</source>
-                    1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>

samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java

@@ -40,17 +40,12 @@ import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
 public class ApiClient {
-private Map
+  private Map<String, Client> hostMap = new HashMap<String, Client>();
-<String, Client> hostMap = new HashMap
+  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-<String, Client>();
-private Map
-<String, String> defaultHeaderMap = new HashMap
-<String, String>();
   private boolean debugging = false;
   private String basePath = "http://petstore.swagger.io/v2";
 
-private Map
+  private Map<String, Authentication> authentications;
-<String, Authentication> authentications;
 
   private DateFormat dateFormat;
 
@@ -66,8 +61,7 @@ this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
     setUserAgent("Java-Swagger");
 
     // Setup authentications (key: authentication name, value: authentication).
-authentications = new HashMap
+    authentications = new HashMap<String, Authentication>();
-<String, Authentication>();
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     authentications.put("petstore_auth", new OAuth());
     // Prevent the authentications from being modified.
@@ -86,8 +80,7 @@ return this;
   /**
    * Get authentications (key: authentication name, value: authentication).
    */
-public Map
+  public Map<String, Authentication> getAuthentications() {
-<String, Authentication> getAuthentications() {
     return authentications;
   }
 
@@ -347,10 +340,7 @@ throw new ApiException(500, e.getMessage());
    * @param authNames The authentications to apply
    * @return The response body in type of string
    */
-public String invokeAPI(String path, String method, Map
+  public String invokeAPI(String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
-<String, String> queryParams, Object body, Map
-<String, String> headerParams, Map
-<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
     updateParamsForAuth(authNames, queryParams, headerParams);
 
     Client client = getClient();
@@ -466,9 +456,7 @@ respBody);
    *
    * @param authNames The authentications to apply
    */
-private void updateParamsForAuth(String[] authNames, Map
+  private void updateParamsForAuth(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
-<String, String> queryParams, Map
-<String, String> headerParams) {
     for (String authName : authNames) {
       Authentication auth = authentications.get(authName);
       if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
@@ -479,12 +467,10 @@ auth.applyToParams(queryParams, headerParams);
   /**
    * Encode the given form parameters as request body.
    */
-private String getXWWWFormUrlencodedParams(Map
+  private String getXWWWFormUrlencodedParams(Map<String, String> formParams) {
-<String, String> formParams) {
     StringBuilder formParamBuilder = new StringBuilder();
 
-for (Entry
+    for (Entry<String, String> param : formParams.entrySet()) {
-<String, String> param : formParams.entrySet()) {
       String keyStr = parameterToString(param.getKey());
       String valueStr = parameterToString(param.getValue());
 

samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java

@@ -6,9 +6,7 @@ import java.util.List;
 public class ApiException extends Exception {
   private int code = 0;
   private String message = null;
-private Map
+  private Map<String, List<String>> responseHeaders = null;
-<String, List
-<String>> responseHeaders = null;
   private String responseBody = null;
 
   public ApiException() {}
@@ -18,10 +16,7 @@ private Map
     this.message = message;
   }
 
-    public ApiException(int code, String message, Map
+  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    <String
-    , List
-    <String>> responseHeaders, String responseBody) {
     this.code = code;
     this.message = message;
     this.responseHeaders = responseHeaders;
@@ -39,10 +34,7 @@ private Map
   /**
    * Get the HTTP response headers.
    */
-        public Map
+  public Map<String, List<String>> getResponseHeaders() {
-        <String
-        , List
-        <String>> getResponseHeaders() {
     return responseHeaders;
   }
 

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

@@ -54,15 +54,9 @@ import java.util.HashMap;
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -117,15 +111,9 @@ import java.util.HashMap;
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -180,15 +168,9 @@ import java.util.HashMap;
     String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (status != null)
       queryParams.put("status", apiClient.parameterToString(status));
@@ -245,15 +227,9 @@ import java.util.HashMap;
     String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (tags != null)
       queryParams.put("tags", apiClient.parameterToString(tags));
@@ -316,15 +292,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -352,7 +322,7 @@ import java.util.HashMap;
     }
 
     try {
-        String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
       String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
       if(response != null){
         return (Pet) apiClient.deserialize(response, "", Pet.class);
@@ -387,15 +357,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -471,15 +435,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -544,15 +502,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

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

@@ -53,15 +53,9 @@ import java.util.HashMap;
     String path = "/store/inventory".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -116,15 +110,9 @@ import java.util.HashMap;
     String path = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -185,15 +173,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -254,15 +236,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

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

@@ -54,15 +54,9 @@ import java.util.HashMap;
     String path = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -117,15 +111,9 @@ import java.util.HashMap;
     String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -180,15 +168,9 @@ import java.util.HashMap;
     String path = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -244,15 +226,9 @@ import java.util.HashMap;
     String path = "/user/login".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     if (username != null)
       queryParams.put("username", apiClient.parameterToString(username));
@@ -310,15 +286,9 @@ import java.util.HashMap;
     String path = "/user/logout".replaceAll("\\{format\\}","json");
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -379,15 +349,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -449,15 +413,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 
@@ -518,15 +476,9 @@ import java.util.HashMap;
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-        Map
+    Map<String, String> queryParams = new HashMap<String, String>();
-        <String, String> queryParams = new HashMap
+    Map<String, String> headerParams = new HashMap<String, String>();
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
 
     
 

samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java

@@ -39,9 +39,7 @@ this.apiKeyPrefix = apiKeyPrefix;
   }
 
   @Override
-public void applyToParams(Map
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
-<String, String> queryParams, Map
-<String, String> headerParams) {
     String value;
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;

samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java

@@ -4,7 +4,5 @@ import java.util.Map;
 
 public interface Authentication {
   /** Apply authentication settings to header and query params. */
-void applyToParams(Map
+  void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams);
-<String, String> queryParams, Map
-<String, String> headerParams);
 }

samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java

@@ -26,9 +26,7 @@ this.password = password;
   }
 
   @Override
-public void applyToParams(Map
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
-<String, String> queryParams, Map
-<String, String> headerParams) {
     String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
     try {
       headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));

samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java

@@ -4,9 +4,7 @@ import java.util.Map;
 
 public class OAuth implements Authentication {
   @Override
-public void applyToParams(Map
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
-<String, String> queryParams, Map
-<String, String> headerParams) {
     // TODO: support oauth
   }
 }

samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java

@@ -48,4 +48,3 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return sb.toString();
   }
 }
-    

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

@@ -109,4 +109,3 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return sb.toString();
   }
 }
-    

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

@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import io.swagger.client.model.Tag;
 import java.util.*;
+import io.swagger.client.model.Tag;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -111,4 +111,3 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return sb.toString();
   }
 }
-    

samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java

@@ -48,4 +48,3 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return sb.toString();
   }
 }
-    

samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java

@@ -133,4 +133,3 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return sb.toString();
   }
 }
-    

samples/client/petstore/objc/Podfile

@@ -1,5 +1,5 @@
 platform :ios, '6.0'
-xcodeproj 'PetstoreClient/PetstoreClient.xcodeproj'
+xcodeproj 'swaggerClient/swaggerClient.xcodeproj'
 pod 'AFNetworking', '~> 2.1'
 pod 'JSONModel', '~> 1.0'
 pod 'ISO8601'

samples/client/petstore/objc/client/SWGCategory.h

@@ -1,21 +1,15 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGObject.h"
 
 
-
 @protocol SWGCategory
 @end
   
 @interface SWGCategory : SWGObject
 
 
-            
 @property(nonatomic) NSNumber* _id;
 
-            
 @property(nonatomic) NSString* name;
 
-
 @end
-    

samples/client/petstore/objc/client/SWGCategory.m

@@ -1,4 +1,3 @@
-    
 #import "SWGCategory.h"
 
 @implementation SWGCategory
@@ -20,5 +19,4 @@
   }
 }
 
-    
 @end

samples/client/petstore/objc/client/SWGConfiguration.h

@@ -1,5 +1,4 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 
 @interface SWGConfiguration : NSObject
 

samples/client/petstore/objc/client/SWGOrder.h

@@ -1,34 +1,24 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGObject.h"
 
 
-
 @protocol SWGOrder
 @end
   
 @interface SWGOrder : SWGObject
 
 
-            
 @property(nonatomic) NSNumber* _id;
 
-            
 @property(nonatomic) NSNumber* petId;
 
-            
 @property(nonatomic) NSNumber* quantity;
 
-            
 @property(nonatomic) NSDate* shipDate;
-        
 /* Order Status [optional]
  */
 @property(nonatomic) NSString* status;
 
-            
 @property(nonatomic) BOOL complete;
 
-
 @end
-    

samples/client/petstore/objc/client/SWGOrder.m

@@ -1,4 +1,3 @@
-    
 #import "SWGOrder.h"
 
 @implementation SWGOrder
@@ -20,5 +19,4 @@
   }
 }
 
-    
 @end

samples/client/petstore/objc/client/SWGPet.h

@@ -1,9 +1,7 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGObject.h"
-#import "SWGTag.h"
 #import "SWGCategory.h"
-
+#import "SWGTag.h"
 
 
 @protocol SWGPet
@@ -12,25 +10,17 @@
 @interface SWGPet : SWGObject
 
 
-            
 @property(nonatomic) NSNumber* _id;
 
-            
 @property(nonatomic) SWGCategory* category;
 
-            
 @property(nonatomic) NSString* name;
 
-            
 @property(nonatomic) NSArray* photoUrls;
 
-            
 @property(nonatomic) NSArray<SWGTag>* tags;
-        
 /* pet status in the store [optional]
  */
 @property(nonatomic) NSString* status;
 
-
 @end
-    

samples/client/petstore/objc/client/SWGPet.m

@@ -1,4 +1,3 @@
-    
 #import "SWGPet.h"
 
 @implementation SWGPet
@@ -20,5 +19,4 @@
   }
 }
 
-    
 @end

samples/client/petstore/objc/client/SWGPetApi.h

@@ -1,5 +1,4 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGPet.h"
 #import "SWGFile.h"
 #import "SWGObject.h"
@@ -16,7 +15,6 @@
 +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
 +(void) setBasePath:(NSString*)basePath;
 +(NSString*) getBasePath;
-    
 /**
 
  Update an existing pet
@@ -33,7 +31,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Add a new pet to the store
@@ -50,7 +47,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Finds Pets by status
@@ -67,7 +63,6 @@
     
 
 
-    
 /**
 
  Finds Pets by tags
@@ -84,7 +79,6 @@
     
 
 
-    
 /**
 
  Find pet by ID
@@ -101,7 +95,6 @@
     
 
 
-    
 /**
 
  Updates a pet in the store with form data
@@ -122,7 +115,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Deletes a pet
@@ -141,7 +133,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  uploads an image
@@ -163,5 +154,4 @@
 
 
 
-
 @end

samples/client/petstore/objc/client/SWGPetApi.m

@@ -5,7 +5,6 @@
 #import "SWGFile.h"
 
 
-
 @interface SWGPetApi ()
     @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
 @end
@@ -73,7 +72,6 @@
 }
 
 
-    
 /*!
  * Update an existing pet
  * 
@@ -181,7 +179,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Add a new pet to the store
  * 
@@ -289,7 +286,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Finds Pets by status
  * Multiple status values can be provided with comma seperated strings
@@ -384,6 +380,7 @@ return;
                     completionBlock((NSArray<SWGPet>*)objs, nil);
                 }
                 
+                
             }];
     
 
@@ -393,7 +390,6 @@ return;
     
 }
 
-    
 /*!
  * Finds Pets by tags
  * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -488,6 +484,7 @@ return;
                     completionBlock((NSArray<SWGPet>*)objs, nil);
                 }
                 
+                
             }];
     
 
@@ -497,7 +494,6 @@ return;
     
 }
 
-    
 /*!
  * Find pet by ID
  * Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
@@ -548,7 +544,7 @@ return;
     NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
 
     // Authentication setting
-        NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+    NSArray *authSettings = @[@"petstore_auth", @"api_key"];
     
     id bodyDictionary = nil;
     
@@ -570,6 +566,7 @@ return;
 
     
     // complex response
+        
     // comples response type
     return [self.apiClient dictionary: requestUrl
                        method: @"GET"
@@ -596,8 +593,8 @@ return;
 
     
 
-        }
     
+}
 
 /*!
  * Updates a pet in the store with form data
@@ -707,7 +704,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Deletes a pet
  * 
@@ -800,7 +796,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * uploads an image
  * 
@@ -918,7 +913,6 @@ completionBlock(nil);
 
 
 
-    
 @end
 
 

samples/client/petstore/objc/client/SWGStoreApi.h

@@ -1,5 +1,4 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGOrder.h"
 #import "SWGObject.h"
 #import "SWGApiClient.h"
@@ -15,7 +14,6 @@
 +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
 +(void) setBasePath:(NSString*)basePath;
 +(NSString*) getBasePath;
-    
 /**
 
  Returns pet inventories by status
@@ -30,7 +28,6 @@
     
 
 
-    
 /**
 
  Place an order for a pet
@@ -47,7 +44,6 @@
     
 
 
-    
 /**
 
  Find purchase order by ID
@@ -64,7 +60,6 @@
     
 
 
-    
 /**
 
  Delete purchase order by ID
@@ -82,5 +77,4 @@
 
 
 
-
 @end

samples/client/petstore/objc/client/SWGStoreApi.m

@@ -4,7 +4,6 @@
 #import "SWGOrder.h"
 
 
-
 @interface SWGStoreApi ()
     @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
 @end
@@ -72,7 +71,6 @@
 }
 
 
-    
 /*!
  * Returns pet inventories by status
  * Returns a map of status codes to quantities
@@ -146,11 +144,13 @@ if (error) {
                     completionBlock(nil, error);
                     return;
                 }
+                
                 NSDictionary *result = nil;
                 if (data) {
                     result = [[NSDictionary alloc]initWithDictionary: data];
                 }
                 completionBlock(data, nil);
+                
             }];
     
 
@@ -160,7 +160,6 @@ return;
     
 }
 
-    
 /*!
  * Place an order for a pet
  * 
@@ -252,6 +251,7 @@ return;
 
     
     // complex response
+        
     // comples response type
     return [self.apiClient dictionary: requestUrl
                        method: @"POST"
@@ -278,8 +278,8 @@ return;
 
     
 
-        }
     
+}
 
 /*!
  * Find purchase order by ID
@@ -353,6 +353,7 @@ return;
 
     
     // complex response
+        
     // comples response type
     return [self.apiClient dictionary: requestUrl
                        method: @"GET"
@@ -379,8 +380,8 @@ return;
 
     
 
-        }
     
+}
 
 /*!
  * Delete purchase order by ID
@@ -472,7 +473,6 @@ completionBlock(nil);
 
 
 
-    
 @end
 
 

samples/client/petstore/objc/client/SWGTag.h

@@ -1,21 +1,15 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGObject.h"
 
 
-
 @protocol SWGTag
 @end
   
 @interface SWGTag : SWGObject
 
 
-            
 @property(nonatomic) NSNumber* _id;
 
-            
 @property(nonatomic) NSString* name;
 
-
 @end
-    

samples/client/petstore/objc/client/SWGTag.m

@@ -1,4 +1,3 @@
-    
 #import "SWGTag.h"
 
 @implementation SWGTag
@@ -20,5 +19,4 @@
   }
 }
 
-    
 @end

samples/client/petstore/objc/client/SWGUser.h

@@ -1,40 +1,28 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGObject.h"
 
 
-
 @protocol SWGUser
 @end
   
 @interface SWGUser : SWGObject
 
 
-            
 @property(nonatomic) NSNumber* _id;
 
-            
 @property(nonatomic) NSString* username;
 
-            
 @property(nonatomic) NSString* firstName;
 
-            
 @property(nonatomic) NSString* lastName;
 
-            
 @property(nonatomic) NSString* email;
 
-            
 @property(nonatomic) NSString* password;
 
-            
 @property(nonatomic) NSString* phone;
-        
 /* User Status [optional]
  */
 @property(nonatomic) NSNumber* userStatus;
 
-
 @end
-    

samples/client/petstore/objc/client/SWGUser.m

@@ -1,4 +1,3 @@
-    
 #import "SWGUser.h"
 
 @implementation SWGUser
@@ -20,5 +19,4 @@
   }
 }
 
-    
 @end

samples/client/petstore/objc/client/SWGUserApi.h

@@ -1,5 +1,4 @@
-#import
+#import <Foundation/Foundation.h>
-<Foundation/Foundation.h>
 #import "SWGUser.h"
 #import "SWGObject.h"
 #import "SWGApiClient.h"
@@ -15,7 +14,6 @@
 +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
 +(void) setBasePath:(NSString*)basePath;
 +(NSString*) getBasePath;
-    
 /**
 
  Create user
@@ -32,7 +30,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Creates list of users with given input array
@@ -49,7 +46,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Creates list of users with given input array
@@ -66,7 +62,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Logs user into the system
@@ -85,7 +80,6 @@
     
 
 
-    
 /**
 
  Logs out current logged in user session
@@ -100,7 +94,6 @@
     (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Get user by user name
@@ -117,7 +110,6 @@
     
 
 
-    
 /**
 
  Updated user
@@ -136,7 +128,6 @@
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-    
 /**
 
  Delete user
@@ -154,5 +145,4 @@
 
 
 
-
 @end

samples/client/petstore/objc/client/SWGUserApi.m

@@ -4,7 +4,6 @@
 #import "SWGUser.h"
 
 
-
 @interface SWGUserApi ()
     @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
 @end
@@ -72,7 +71,6 @@
 }
 
 
-    
 /*!
  * Create user
  * This can only be done by the logged in user.
@@ -180,7 +178,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Creates list of users with given input array
  * 
@@ -288,7 +285,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Creates list of users with given input array
  * 
@@ -396,7 +392,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Logs user into the system
  * 
@@ -494,13 +489,15 @@ completionBlock(result, nil);
     
     
 
+
+    
     // complex response
         
 
     
 
-        }
     
+}
 
 /*!
  * Logs out current logged in user session
@@ -584,7 +581,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Get user by user name
  * 
@@ -657,6 +653,7 @@ completionBlock(nil);
 
     
     // complex response
+        
     // comples response type
     return [self.apiClient dictionary: requestUrl
                        method: @"GET"
@@ -683,8 +680,8 @@ completionBlock(nil);
 
     
 
-        }
     
+}
 
 /*!
  * Updated user
@@ -799,7 +796,6 @@ completionBlock(nil);
     
 }
 
-    
 /*!
  * Delete user
  * This can only be done by the logged in user.
@@ -890,7 +886,6 @@ completionBlock(nil);
 
 
 
-    
 @end
 
 

samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm

@@ -317,7 +317,7 @@ sub new {
       
 
       # authentication setting, if any
-      my $auth_settings = ['api_key', 'petstore_auth'];
+      my $auth_settings = ['petstore_auth', 'api_key'];
 
       # make the API Call
       my $response = $self->{api_client}->call_api($_resource_path, $_method,

samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php

@@ -327,7 +327,7 @@ class PetApi {
       }
 
       // authentication setting, if any
-      $authSettings = array('api_key', 'petstore_auth');
+      $authSettings = array('petstore_auth', 'api_key');
 
       // make the API Call
       $response = $this->apiClient->callAPI($resourcePath, $method,

samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py

@@ -9,8 +9,8 @@ from .models.order import Order
 
 # import apis into sdk package
 from .apis.user_api import UserApi
-from .apis.pet_api import PetApi
 from .apis.store_api import StoreApi
+from .apis.pet_api import PetApi
 
 # import ApiClient
 from .api_client import ApiClient

samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/__init__.py

@@ -2,6 +2,6 @@ from __future__ import absolute_import
 
 # import apis into api package
 from .user_api import UserApi
-from .pet_api import PetApi
 from .store_api import StoreApi
+from .pet_api import PetApi
 

samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py

@@ -298,7 +298,7 @@ class PetApi(object):
         header_params['Content-Type'] = self.api_client.select_header_content_type([])
 
         # Authentication setting
-        auth_settings = ['api_key', 'petstore_auth']
+        auth_settings = ['petstore_auth', 'api_key']
 
         response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
                                             body=body_params, post_params=form_params, files=files,

samples/client/petstore/qt5cpp/client/SWGCategory.cpp

@@ -3,14 +3,10 @@
 
 #include "SWGHelpers.h"
 
-    #include
+#include <QJsonDocument>
-    <QJsonDocument>
+#include <QJsonArray>
-        #include
+#include <QObject>
-    <QJsonArray>
+#include <QDebug>
-        #include
-    <QObject>
-        #include
-    <QDebug>
 
 namespace Swagger {
 
@@ -85,7 +81,6 @@
     return obj;
 }
 
-    
 qint64
 SWGCategory::getId() {
     return id;
@@ -95,7 +90,6 @@
     this->id = id;
 }
 
-    
 QString*
 SWGCategory::getName() {
     return name;
@@ -107,6 +101,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/qt5cpp/client/SWGCategory.h

@@ -7,8 +7,7 @@
 #ifndef SWGCategory_H_
 #define SWGCategory_H_
 
-#include
+#include <QJsonObject>
-<QJsonObject>
 
 
 #include <QString>

samples/client/petstore/qt5cpp/client/SWGHelpers.cpp

@@ -1,12 +1,9 @@
 #include "SWGHelpers.h"
 #include "SWGModelFactory.h"
 #include "SWGObject.h"
-#import
+#import <QDebug>
-<QDebug>
+#import <QJsonArray>
-    #import
+#import <QJsonValue>
-    <QJsonArray>
-        #import
-        <QJsonValue>
 
 namespace Swagger {
 
@@ -17,27 +14,19 @@
         return;
     }
     if(QStringLiteral("bool").compare(type) == 0) {
-            bool * val = static_cast
+        bool * val = static_cast<bool*>(value);
-            <bool
-            *>(value);
         *val = obj.toBool();
     }
     else if(QStringLiteral("qint32").compare(type) == 0) {
-            qint32 *val = static_cast
+        qint32 *val = static_cast<qint32*>(value);
-            <qint32
-            *>(value);
         *val = obj.toInt();
     }
     else if(QStringLiteral("qint64").compare(type) == 0) {
-            qint64 *val = static_cast
+        qint64 *val = static_cast<qint64*>(value);
-            <qint64
-            *>(value);
         *val = obj.toVariant().toLongLong();
     }
     else if (QStringLiteral("QString").compare(type) == 0) {
-            QString **val = static_cast
+        QString **val = static_cast<QString**>(value);
-            <QString
-            **>(value);
 
         if(val != NULL) {
             if(!obj.isNull()) {
@@ -62,20 +51,14 @@
         SWGObject * so = (SWGObject*)Swagger::create(type);
         if(so != NULL) {
             so->fromJsonObject(jsonObj);
-            SWGObject **val = static_cast
+            SWGObject **val = static_cast<SWGObject**>(value);
-            <SWGObject
-            **>(value);
             delete *val;
             *val = so;
         }
     }
     else if(type.startsWith("QList") && QString("").compare(complexType) != 0 && obj.isArray()) {
         // list of values
-            QList
+        QList<void*>* output = new QList<void*>();
-            <void
-            *>* output = new QList
-            <void
-            *>();
         QJsonArray arr = obj.toArray();
         foreach (const QJsonValue & jval, arr) {
             if(complexType.startsWith("SWG")) {
@@ -105,12 +88,7 @@
                 }
             }
         }
-            QList
+        QList<void*> **val = static_cast<QList<void*>**>(value);
-            <void
-            *> **val = static_cast
-            <QList
-            <void
-            *>**>(value);
         delete *val;
         *val = output;
     }
@@ -122,8 +100,7 @@
         return;
     }
     if(type.startsWith("SWG")) {
-            SWGObject *swgObject = reinterpret_cast
+        SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
-            <SWGObject *>(value);
         if(swgObject != NULL) {
             QJsonObject* o = (*swgObject).asJsonObject();
             if(name != NULL) {
@@ -139,35 +116,25 @@
         }
     }
     else if(QStringLiteral("QString").compare(type) == 0) {
-                QString* str = static_cast
+        QString* str = static_cast<QString*>(value);
-                <QString
-                *>(value);
         output->insert(name, QJsonValue(*str));
     }
     else if(QStringLiteral("qint32").compare(type) == 0) {
-                qint32* str = static_cast
+        qint32* str = static_cast<qint32*>(value);
-                <qint32
-                *>(value);
         output->insert(name, QJsonValue(*str));    
     }
     else if(QStringLiteral("qint64").compare(type) == 0) {
-                qint64* str = static_cast
+        qint64* str = static_cast<qint64*>(value);
-                <qint64
-                *>(value);
         output->insert(name, QJsonValue(*str));    
     }
     else if(QStringLiteral("bool").compare(type) == 0) {
-                bool* str = static_cast
+        bool* str = static_cast<bool*>(value);
-                <bool
-                *>(value);
         output->insert(name, QJsonValue(*str));    
     }
 }
 
 void
-                toJsonArray(QList
+toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString innerType) {
-                <void
-                *>* value, QJsonArray* output, QString innerName, QString innerType) {
     foreach(void* obj, *value) {
         QJsonObject element;
 
@@ -178,9 +145,7 @@
 
 QString
 stringValue(QString* value) {
-                QString* str = static_cast
+    QString* str = static_cast<QString*>(value);
-                <QString
-                *>(value);
     return QString(*str);
 }
 

samples/client/petstore/qt5cpp/client/SWGHelpers.h

@@ -1,14 +1,11 @@
 #ifndef SWGHELPERS_H
 #define SWGHELPERS_H
 
-#include
+#include <QJsonValue>
-<QJsonValue>
 
 namespace Swagger {
     void setValue(void* value, QJsonValue obj, QString type, QString complexType);
-    void toJsonArray(QList
+    void toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString innerType);
-    <void
-    *>* value, QJsonArray* output, QString innerName, QString innerType);
     void toJsonValue(QString name, void* value, QJsonObject* output, QString type);
     bool isCompatibleJsonValue(QString type);
     QString stringValue(QString* value);

samples/client/petstore/qt5cpp/client/SWGModelFactory.h

@@ -32,8 +32,7 @@ return NULL;
   inline void* create(QString json, QString type) {
     void* val = create(type);
     if(val != NULL) {
-SWGObject* obj = static_cast
+      SWGObject* obj = static_cast<SWGObject*>(val);
-<SWGObject*>(val);
       return obj->fromJson(json);
     }
     if(type.startsWith("QString")) {

samples/client/petstore/qt5cpp/client/SWGObject.h

@@ -1,8 +1,7 @@
 #ifndef _SWG_OBJECT_H_
 #define _SWG_OBJECT_H_
 
-#include
+#include <QJsonValue>
-<QJsonValue>
 
 class SWGObject {
   public:

samples/client/petstore/qt5cpp/client/SWGOrder.cpp

@@ -3,14 +3,10 @@
 
 #include "SWGHelpers.h"
 
-    #include
+#include <QJsonDocument>
-    <QJsonDocument>
+#include <QJsonArray>
-        #include
+#include <QObject>
-    <QJsonArray>
+#include <QDebug>
-        #include
-    <QObject>
-        #include
-    <QDebug>
 
 namespace Swagger {
 
@@ -108,7 +104,6 @@
     return obj;
 }
 
-    
 qint64
 SWGOrder::getId() {
     return id;
@@ -118,7 +113,6 @@
     this->id = id;
 }
 
-    
 qint64
 SWGOrder::getPetId() {
     return petId;
@@ -128,7 +122,6 @@
     this->petId = petId;
 }
 
-    
 qint32
 SWGOrder::getQuantity() {
     return quantity;
@@ -138,7 +131,6 @@
     this->quantity = quantity;
 }
 
-    
 QDateTime*
 SWGOrder::getShipDate() {
     return shipDate;
@@ -148,7 +140,6 @@
     this->shipDate = shipDate;
 }
 
-    
 QString*
 SWGOrder::getStatus() {
     return status;
@@ -158,7 +149,6 @@
     this->status = status;
 }
 
-    
 bool
 SWGOrder::getComplete() {
     return complete;
@@ -170,6 +160,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/qt5cpp/client/SWGOrder.h

@@ -7,8 +7,7 @@
 #ifndef SWGOrder_H_
 #define SWGOrder_H_
 
-#include
+#include <QJsonObject>
-<QJsonObject>
 
 
 #include "QDateTime.h"

samples/client/petstore/qt5cpp/client/SWGPet.cpp

@@ -3,14 +3,10 @@
 
 #include "SWGHelpers.h"
 
-    #include
+#include <QJsonDocument>
-    <QJsonDocument>
+#include <QJsonArray>
-        #include
+#include <QObject>
-    <QJsonArray>
+#include <QDebug>
-        #include
-    <QObject>
-        #include
-    <QDebug>
 
 namespace Swagger {
 
@@ -118,8 +114,7 @@
     
     QList<QString*>* photoUrlsList = photoUrls;
     QJsonArray photoUrlsJsonArray;
-                toJsonArray((QList
+    toJsonArray((QList<void*>*)photoUrls, &photoUrlsJsonArray, "photoUrls", "QString");
-                <void*>*)photoUrls, &photoUrlsJsonArray, "photoUrls", "QString");
 
     obj->insert("photoUrls", photoUrlsJsonArray);
     
@@ -128,8 +123,7 @@
     
     QList<SWGTag*>* tagsList = tags;
     QJsonArray tagsJsonArray;
-                toJsonArray((QList
+    toJsonArray((QList<void*>*)tags, &tagsJsonArray, "tags", "SWGTag");
-                <void*>*)tags, &tagsJsonArray, "tags", "SWGTag");
 
     obj->insert("tags", tagsJsonArray);
     
@@ -145,7 +139,6 @@
     return obj;
 }
 
-    
 qint64
 SWGPet::getId() {
     return id;
@@ -155,7 +148,6 @@
     this->id = id;
 }
 
-    
 SWGCategory*
 SWGPet::getCategory() {
     return category;
@@ -165,7 +157,6 @@
     this->category = category;
 }
 
-    
 QString*
 SWGPet::getName() {
     return name;
@@ -175,7 +166,6 @@
     this->name = name;
 }
 
-    
 QList<QString*>*
 SWGPet::getPhotoUrls() {
     return photoUrls;
@@ -185,7 +175,6 @@
     this->photoUrls = photoUrls;
 }
 
-    
 QList<SWGTag*>*
 SWGPet::getTags() {
     return tags;
@@ -195,7 +184,6 @@
     this->tags = tags;
 }
 
-    
 QString*
 SWGPet::getStatus() {
     return status;
@@ -207,6 +195,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/qt5cpp/client/SWGPet.h

@@ -7,14 +7,13 @@
 #ifndef SWGPet_H_
 #define SWGPet_H_
 
-#include
+#include <QJsonObject>
-<QJsonObject>
 
 
-#include "SWGTag.h"
-#include <QList>
-#include "SWGCategory.h"
 #include <QString>
+#include "SWGCategory.h"
+#include <QList>
+#include "SWGTag.h"
 
 #include "SWGObject.h"
 

samples/client/petstore/qt5cpp/client/SWGPetApi.cpp

@@ -2,10 +2,8 @@
 #include "SWGHelpers.h"
 #include "SWGModelFactory.h"
 
-#include
+#include <QJsonArray>
-<QJsonArray>
+#include <QJsonDocument>
-    #include
-    <QJsonDocument>
 
 namespace Swagger {
 SWGPetApi::SWGPetApi() {}
@@ -17,8 +15,6 @@
     this->basePath = basePath;
 }
 
-        
-            
 void
 SWGPetApi::updatePet(SWGPet body) {
     QString fullPath;
@@ -67,7 +63,6 @@
     
     emit updatePetSignal();
 }
-            
 void
 SWGPetApi::addPet(SWGPet body) {
     QString fullPath;
@@ -116,7 +111,6 @@
     
     emit addPetSignal();
 }
-            
 void
 SWGPetApi::findPetsByStatus(QList<QString*>* status) {
     QString fullPath;
@@ -222,7 +216,6 @@
     emit findPetsByStatusSignal(output);
     
 }
-            
 void
 SWGPetApi::findPetsByTags(QList<QString*>* tags) {
     QString fullPath;
@@ -328,7 +321,6 @@
     emit findPetsByTagsSignal(output);
     
 }
-            
 void
 SWGPetApi::getPetById(qint64 petId) {
     QString fullPath;
@@ -374,8 +366,7 @@
     
     
     QString json(worker->response);
-                                SWGPet* output = static_cast<SWGPet*>(create(json,
+    SWGPet* output = static_cast<SWGPet*>(create(json, QString("SWGPet")));
-                                QString("SWGPet")));
     
     
     
@@ -385,11 +376,8 @@
     emit getPetByIdSignal(output);
     
 }
-            
 void
-                SWGPetApi::updatePetWithForm(QString* petId
+SWGPetApi::updatePetWithForm(QString* petId, QString* name, QString* status) {
-                , QString* name
-                , QString* status) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
 
@@ -442,10 +430,8 @@
     
     emit updatePetWithFormSignal();
 }
-            
 void
-                SWGPetApi::deletePet(QString* apiKey
+SWGPetApi::deletePet(QString* apiKey, qint64 petId) {
-                , qint64 petId) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
 
@@ -492,11 +478,8 @@
     
     emit deletePetSignal();
 }
-            
 void
-                SWGPetApi::uploadFile(qint64 petId
+SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file) {
-                , QString* additionalMetadata
-                , SWGHttpRequestInputFileElement* file) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage");
 
@@ -545,6 +528,4 @@
     
     emit uploadFileSignal();
 }
-            
-        
 } /* namespace Swagger */

samples/client/petstore/qt5cpp/client/SWGPetApi.h

@@ -7,8 +7,7 @@
 #include <QString>
 #include "SWGHttpRequest.h"
 
-#include
+#include <QObject>
-<QObject>
 
 namespace Swagger {
 
@@ -28,14 +27,9 @@
     void findPetsByStatus(QList<QString*>* status);
     void findPetsByTags(QList<QString*>* tags);
     void getPetById(qint64 petId);
-    void updatePetWithForm(QString* petId
+    void updatePetWithForm(QString* petId, QString* name, QString* status);
-        , QString* name
+    void deletePet(QString* apiKey, qint64 petId);
-        , QString* status);
+    void uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file);
-    void deletePet(QString* apiKey
-        , qint64 petId);
-    void uploadFile(qint64 petId
-        , QString* additionalMetadata
-        , SWGHttpRequestInputFileElement* file);
     
 private:
     void updatePetCallback (HttpRequestWorker * worker);

samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp

@@ -2,10 +2,8 @@
 #include "SWGHelpers.h"
 #include "SWGModelFactory.h"
 
-#include
+#include <QJsonArray>
-<QJsonArray>
+#include <QJsonDocument>
-    #include
-    <QJsonDocument>
 
 namespace Swagger {
 SWGStoreApi::SWGStoreApi() {}
@@ -17,8 +15,6 @@
     this->basePath = basePath;
 }
 
-        
-            
 void
 SWGStoreApi::getInventory() {
     QString fullPath;
@@ -82,7 +78,6 @@
     emit getInventorySignal(output);
     
 }
-            
 void
 SWGStoreApi::placeOrder(SWGOrder body) {
     QString fullPath;
@@ -130,8 +125,7 @@
     
     
     QString json(worker->response);
-                                SWGOrder* output = static_cast<SWGOrder*>(create(json,
+    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
-                                QString("SWGOrder")));
     
     
     
@@ -141,7 +135,6 @@
     emit placeOrderSignal(output);
     
 }
-            
 void
 SWGStoreApi::getOrderById(QString* orderId) {
     QString fullPath;
@@ -187,8 +180,7 @@
     
     
     QString json(worker->response);
-                                SWGOrder* output = static_cast<SWGOrder*>(create(json,
+    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
-                                QString("SWGOrder")));
     
     
     
@@ -198,7 +190,6 @@
     emit getOrderByIdSignal(output);
     
 }
-            
 void
 SWGStoreApi::deleteOrder(QString* orderId) {
     QString fullPath;
@@ -245,6 +236,4 @@
     
     emit deleteOrderSignal();
 }
-            
-        
 } /* namespace Swagger */

samples/client/petstore/qt5cpp/client/SWGStoreApi.h

@@ -7,8 +7,7 @@
 #include "SWGOrder.h"
 #include <QString>
 
-#include
+#include <QObject>
-<QObject>
 
 namespace Swagger {
 

samples/client/petstore/qt5cpp/client/SWGTag.cpp

@@ -3,14 +3,10 @@
 
 #include "SWGHelpers.h"
 
-    #include
+#include <QJsonDocument>
-    <QJsonDocument>
+#include <QJsonArray>
-        #include
+#include <QObject>
-    <QJsonArray>
+#include <QDebug>
-        #include
-    <QObject>
-        #include
-    <QDebug>
 
 namespace Swagger {
 
@@ -85,7 +81,6 @@
     return obj;
 }
 
-    
 qint64
 SWGTag::getId() {
     return id;
@@ -95,7 +90,6 @@
     this->id = id;
 }
 
-    
 QString*
 SWGTag::getName() {
     return name;
@@ -107,6 +101,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/qt5cpp/client/SWGTag.h

@@ -7,8 +7,7 @@
 #ifndef SWGTag_H_
 #define SWGTag_H_
 
-#include
+#include <QJsonObject>
-<QJsonObject>
 
 
 #include <QString>

samples/client/petstore/qt5cpp/client/SWGUser.cpp

@@ -3,14 +3,10 @@
 
 #include "SWGHelpers.h"
 
-    #include
+#include <QJsonDocument>
-    <QJsonDocument>
+#include <QJsonArray>
-        #include
+#include <QObject>
-    <QJsonArray>
+#include <QDebug>
-        #include
-    <QObject>
-        #include
-    <QDebug>
 
 namespace Swagger {
 
@@ -144,7 +140,6 @@
     return obj;
 }
 
-    
 qint64
 SWGUser::getId() {
     return id;
@@ -154,7 +149,6 @@
     this->id = id;
 }
 
-    
 QString*
 SWGUser::getUsername() {
     return username;
@@ -164,7 +158,6 @@
     this->username = username;
 }
 
-    
 QString*
 SWGUser::getFirstName() {
     return firstName;
@@ -174,7 +167,6 @@
     this->firstName = firstName;
 }
 
-    
 QString*
 SWGUser::getLastName() {
     return lastName;
@@ -184,7 +176,6 @@
     this->lastName = lastName;
 }
 
-    
 QString*
 SWGUser::getEmail() {
     return email;
@@ -194,7 +185,6 @@
     this->email = email;
 }
 
-    
 QString*
 SWGUser::getPassword() {
     return password;
@@ -204,7 +194,6 @@
     this->password = password;
 }
 
-    
 QString*
 SWGUser::getPhone() {
     return phone;
@@ -214,7 +203,6 @@
     this->phone = phone;
 }
 
-    
 qint32
 SWGUser::getUserStatus() {
     return userStatus;
@@ -226,6 +214,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/qt5cpp/client/SWGUser.h

@@ -7,8 +7,7 @@
 #ifndef SWGUser_H_
 #define SWGUser_H_
 
-#include
+#include <QJsonObject>
-<QJsonObject>
 
 
 #include <QString>

samples/client/petstore/qt5cpp/client/SWGUserApi.cpp

@@ -2,10 +2,8 @@
 #include "SWGHelpers.h"
 #include "SWGModelFactory.h"
 
-#include
+#include <QJsonArray>
-<QJsonArray>
+#include <QJsonDocument>
-    #include
-    <QJsonDocument>
 
 namespace Swagger {
 SWGUserApi::SWGUserApi() {}
@@ -17,8 +15,6 @@
     this->basePath = basePath;
 }
 
-        
-            
 void
 SWGUserApi::createUser(SWGUser body) {
     QString fullPath;
@@ -67,7 +63,6 @@
     
     emit createUserSignal();
 }
-            
 void
 SWGUserApi::createUsersWithArrayInput(QList<SWGUser*>* body) {
     QString fullPath;
@@ -85,9 +80,7 @@
     
     
     QJsonArray* bodyArray = new QJsonArray();
-                        toJsonArray((QList
+    toJsonArray((QList<void*>*)body, bodyArray, QString("body"), QString("SWGUser*"));
-                        <void
-                        *>*)body, bodyArray, QString("body"), QString("SWGUser*"));
 
     QJsonDocument doc(*bodyArray);
     QByteArray bytes = doc.toJson();
@@ -123,7 +116,6 @@
     
     emit createUsersWithArrayInputSignal();
 }
-            
 void
 SWGUserApi::createUsersWithListInput(QList<SWGUser*>* body) {
     QString fullPath;
@@ -141,9 +133,7 @@
     
     
     QJsonArray* bodyArray = new QJsonArray();
-                        toJsonArray((QList
+    toJsonArray((QList<void*>*)body, bodyArray, QString("body"), QString("SWGUser*"));
-                        <void
-                        *>*)body, bodyArray, QString("body"), QString("SWGUser*"));
 
     QJsonDocument doc(*bodyArray);
     QByteArray bytes = doc.toJson();
@@ -179,10 +169,8 @@
     
     emit createUsersWithListInputSignal();
 }
-            
 void
-                SWGUserApi::loginUser(QString* username
+SWGUserApi::loginUser(QString* username, QString* password) {
-                , QString* password) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/login");
 
@@ -247,8 +235,7 @@
     
     
     QString json(worker->response);
-                                QString* output = static_cast<QString*>(create(json,
+    QString* output = static_cast<QString*>(create(json, QString("QString")));
-                                QString("QString")));
     
     
     
@@ -258,7 +245,6 @@
     emit loginUserSignal(output);
     
 }
-            
 void
 SWGUserApi::logoutUser() {
     QString fullPath;
@@ -302,7 +288,6 @@
     
     emit logoutUserSignal();
 }
-            
 void
 SWGUserApi::getUserByName(QString* username) {
     QString fullPath;
@@ -348,8 +333,7 @@
     
     
     QString json(worker->response);
-                                SWGUser* output = static_cast<SWGUser*>(create(json,
+    SWGUser* output = static_cast<SWGUser*>(create(json, QString("SWGUser")));
-                                QString("SWGUser")));
     
     
     
@@ -359,10 +343,8 @@
     emit getUserByNameSignal(output);
     
 }
-            
 void
-                SWGUserApi::updateUser(QString* username
+SWGUserApi::updateUser(QString* username, SWGUser body) {
-                , SWGUser body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
 
@@ -412,7 +394,6 @@
     
     emit updateUserSignal();
 }
-            
 void
 SWGUserApi::deleteUser(QString* username) {
     QString fullPath;
@@ -459,6 +440,4 @@
     
     emit deleteUserSignal();
 }
-            
-        
 } /* namespace Swagger */

samples/client/petstore/qt5cpp/client/SWGUserApi.h

@@ -7,8 +7,7 @@
 #include <QList>
 #include <QString>
 
-#include
+#include <QObject>
-<QObject>
 
 namespace Swagger {
 
@@ -26,12 +25,10 @@
     void createUser(SWGUser body);
     void createUsersWithArrayInput(QList<SWGUser*>* body);
     void createUsersWithListInput(QList<SWGUser*>* body);
-    void loginUser(QString* username
+    void loginUser(QString* username, QString* password);
-        , QString* password);
     void logoutUser();
     void getUserByName(QString* username);
-    void updateUser(QString* username
+    void updateUser(QString* username, SWGUser body);
-        , SWGUser body);
     void deleteUser(QString* username);
     
 private:

samples/client/petstore/retrofit/pom.xml

@@ -77,8 +77,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/main/java</source>
-                                src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -90,8 +89,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/test/java</source>
-                                src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -102,8 +100,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-                    <source>
+          <source>1.6</source>
-                    1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>

samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java

@@ -47,4 +47,3 @@ import com.google.gson.annotations.SerializedName;
         return sb.toString();
     }
 }
-    

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

@@ -108,4 +108,3 @@ import com.google.gson.annotations.SerializedName;
         return sb.toString();
     }
 }
-    

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

@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import io.swagger.client.model.Tag;
 import java.util.*;
+import io.swagger.client.model.Tag;
 
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
@@ -110,4 +110,3 @@ import com.google.gson.annotations.SerializedName;
         return sb.toString();
     }
 }
-    

samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java

@@ -47,4 +47,3 @@ import com.google.gson.annotations.SerializedName;
         return sb.toString();
     }
 }
-    

samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java

@@ -132,4 +132,3 @@ import com.google.gson.annotations.SerializedName;
         return sb.toString();
     }
 }
-    

samples/client/petstore/ruby/lib/swagger_client.rb

@@ -16,8 +16,8 @@ require 'swagger_client/models/order'
 
 # APIs
 require 'swagger_client/api/user_api'
-require 'swagger_client/api/pet_api'
 require 'swagger_client/api/store_api'
+require 'swagger_client/api/pet_api'
 
 module SwaggerClient
   # Initialize the default configuration

samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb

@@ -190,7 +190,7 @@ module SwaggerClient
       post_body = nil
       
 
-      auth_names = ['api_key', 'petstore_auth']
+      auth_names = ['petstore_auth', 'api_key']
       response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
       obj = Pet.new() and obj.build_from_hash(response)
     end

samples/client/petstore/scala/pom.xml

@@ -81,8 +81,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/main/java</source>
-                                src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -94,8 +93,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
+                <source>src/test/java</source>
-                                src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -106,8 +104,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-                    <source>
+          <source>1.6</source>
-                    1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>

samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala

@@ -3,9 +3,7 @@ package io.swagger.client.model
 
 
 
-
 case class Category (
   id: Long,
   name: String)
   
-    

samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala

@@ -4,7 +4,6 @@ import org.joda.time.DateTime
 
 
 
-
 case class Order (
   id: Long,
   petId: Long,
@@ -14,4 +13,3 @@ import org.joda.time.DateTime
   status: String,
   complete: Boolean)
   
-    

samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala

@@ -5,7 +5,6 @@ import io.swagger.client.model.Tag
 
 
 
-
 case class Pet (
   id: Long,
   category: Category,
@@ -15,4 +14,3 @@ import io.swagger.client.model.Tag
   /* pet status in the store */
   status: String)
   
-    

samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala

@@ -3,9 +3,7 @@ package io.swagger.client.model
 
 
 
-
 case class Tag (
   id: Long,
   name: String)
   
-    

samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala

@@ -3,7 +3,6 @@ package io.swagger.client.model
 
 
 
-
 case class User (
   id: Long,
   username: String,
@@ -15,4 +14,3 @@ package io.swagger.client.model
   /* User Status */
   userStatus: Integer)
   
-    

samples/client/petstore/tizen/client/SamiApiClient.h

@@ -1,5 +1,4 @@
-#include
+#include <FNet.h>
-<FNet.h>
 
 #include "SamiHelpers.h"
 #include "SamiError.h"
@@ -20,8 +19,7 @@
   virtual ~SamiApiClient();
 
   result
-    execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap*
+  execute(String host, String path, String method, IMap* queryParams, String* body, IMap* headerParams, IMap* formParams, String contentType);
-    formParams, String contentType);
 
   void success(void (*res) (HttpResponse*, void (*cb)(void*, SamiError*)), void (*cb)(void*, SamiError*));
 

samples/client/petstore/tizen/client/SamiCategory.cpp

@@ -1,7 +1,6 @@
 
 #include "SamiCategory.h"
-    #include
+#include <FLocales.h>
-    <FLocales.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::System;
@@ -159,7 +158,6 @@
     return pJsonObject;
 }
 
-    
 Long*
 SamiCategory::getPId() {
     return pId;
@@ -169,7 +167,6 @@
     this->pId = pId;
 }
 
-    
 String*
 SamiCategory::getPName() {
     return pName;
@@ -181,6 +178,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/tizen/client/SamiCategory.h

@@ -7,14 +7,10 @@
 #ifndef SamiCategory_H_
 #define SamiCategory_H_
 
-#include
+#include <FApp.h>
-<FApp.h>
+#include <FBase.h>
-    #include
+#include <FSystem.h>
-<FBase.h>
+#include <FWebJson.h>
-    #include
-<FSystem.h>
-    #include
-<FWebJson.h>
 #include "SamiHelpers.h"
 #include "SamiObject.h"
 

samples/client/petstore/tizen/client/SamiError.h

@@ -1,8 +1,7 @@
 #ifndef SamiError_H_
 #define SamiError_H_
 
-#include
+#include <FBase.h>
-<FBase.h>
 
 using namespace Tizen::Base;
 

samples/client/petstore/tizen/client/SamiHelpers.h

@@ -1,16 +1,11 @@
 #ifndef HELPERS_H_
 #define HELPERS_H_
 
-#include
+#include <FApp.h>
-<FApp.h>
+#include <FBase.h>
-    #include
+#include <FSystem.h>
-    <FBase.h>
+#include <FWebJson.h>
-        #include
+#include <FLocales.h>
-        <FSystem.h>
-            #include
-            <FWebJson.h>
-                #include
-                <FLocales.h>
 #include "SamiHelpers.h"
 #include "SamiObject.h"
 

samples/client/petstore/tizen/client/SamiObject.h

@@ -1,12 +1,9 @@
 #ifndef _Sami_OBJECT_H_
 #define _Sami_OBJECT_H_
 
-#include
+#include <FNet.h>
-<FNet.h>
+#include <FWebJson.h>
-    #include
+#include <FBase.h>
-    <FWebJson.h>
-        #include
-        <FBase.h>
 
 using Tizen::Base::String;
 

samples/client/petstore/tizen/client/SamiOrder.cpp

@@ -1,7 +1,6 @@
 
 #include "SamiOrder.h"
-    #include
+#include <FLocales.h>
-    <FLocales.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::System;
@@ -235,7 +234,6 @@
     return pJsonObject;
 }
 
-    
 Long*
 SamiOrder::getPId() {
     return pId;
@@ -245,7 +243,6 @@
     this->pId = pId;
 }
 
-    
 Long*
 SamiOrder::getPPetId() {
     return pPetId;
@@ -255,7 +252,6 @@
     this->pPetId = pPetId;
 }
 
-    
 Integer*
 SamiOrder::getPQuantity() {
     return pQuantity;
@@ -265,7 +261,6 @@
     this->pQuantity = pQuantity;
 }
 
-    
 DateTime*
 SamiOrder::getPShipDate() {
     return pShipDate;
@@ -275,7 +270,6 @@
     this->pShipDate = pShipDate;
 }
 
-    
 String*
 SamiOrder::getPStatus() {
     return pStatus;
@@ -285,7 +279,6 @@
     this->pStatus = pStatus;
 }
 
-    
 Boolean*
 SamiOrder::getPComplete() {
     return pComplete;
@@ -297,6 +290,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/tizen/client/SamiOrder.h

@@ -7,25 +7,21 @@
 #ifndef SamiOrder_H_
 #define SamiOrder_H_
 
-#include
+#include <FApp.h>
-<FApp.h>
+#include <FBase.h>
-    #include
+#include <FSystem.h>
-<FBase.h>
+#include <FWebJson.h>
-    #include
-<FSystem.h>
-    #include
-<FWebJson.h>
 #include "SamiHelpers.h"
 #include "SamiObject.h"
 
 using namespace Tizen::Web::Json;
 
 
+using Tizen::Base::Integer;
 using Tizen::Base::Long;
-using Tizen::Base::DateTime;
 using Tizen::Base::String;
 using Tizen::Base::Boolean;
-using Tizen::Base::Integer;
+using Tizen::Base::DateTime;
 
 
 namespace Swagger {

samples/client/petstore/tizen/client/SamiPet.cpp

@@ -1,7 +1,6 @@
 
 #include "SamiPet.h"
-    #include
+#include <FLocales.h>
-    <FLocales.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::System;
@@ -235,7 +234,6 @@
     return pJsonObject;
 }
 
-    
 Long*
 SamiPet::getPId() {
     return pId;
@@ -245,7 +243,6 @@
     this->pId = pId;
 }
 
-    
 SamiCategory*
 SamiPet::getPCategory() {
     return pCategory;
@@ -255,7 +252,6 @@
     this->pCategory = pCategory;
 }
 
-    
 String*
 SamiPet::getPName() {
     return pName;
@@ -265,7 +261,6 @@
     this->pName = pName;
 }
 
-    
 IList*
 SamiPet::getPPhotoUrls() {
     return pPhotoUrls;
@@ -275,7 +270,6 @@
     this->pPhotoUrls = pPhotoUrls;
 }
 
-    
 IList*
 SamiPet::getPTags() {
     return pTags;
@@ -285,7 +279,6 @@
     this->pTags = pTags;
 }
 
-    
 String*
 SamiPet::getPStatus() {
     return pStatus;
@@ -297,6 +290,5 @@
 
 
 
-
 } /* namespace Swagger */
 

samples/client/petstore/tizen/client/SamiPet.h

@@ -7,23 +7,19 @@
 #ifndef SamiPet_H_
 #define SamiPet_H_
 
-#include
+#include <FApp.h>
-<FApp.h>
+#include <FBase.h>
-    #include
+#include <FSystem.h>
-<FBase.h>
+#include <FWebJson.h>
-    #include
-<FSystem.h>
-    #include
-<FWebJson.h>
 #include "SamiHelpers.h"
 #include "SamiObject.h"
 
 using namespace Tizen::Web::Json;
 
 
-#include "SamiCategory.h"
 using Tizen::Base::Long;
 using Tizen::Base::String;
+#include "SamiCategory.h"
 #include "SamiTag.h"
 using Tizen::Base::Collection::IList;
 

samples/client/petstore/tizen/client/SamiPetApi.cpp

@@ -16,7 +16,6 @@ namespace Swagger {
 
 }
 
-    
 void
 updatePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -66,7 +65,6 @@ namespace Swagger {
   
 }
 
-    
 void
 addPetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -116,7 +114,6 @@ namespace Swagger {
   
 }
 
-    
 void
 findPetsByStatusProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -186,7 +183,6 @@ namespace Swagger {
   return null;
 }
 
-    
 void
 findPetsByTagsProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -256,7 +252,6 @@ namespace Swagger {
   return null;
 }
 
-    
 void
 getPetByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -324,7 +319,6 @@ namespace Swagger {
   return null;
 }
 
-    
 void
 updatePetWithFormProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -371,7 +365,6 @@ namespace Swagger {
   
 }
 
-    
 void
 deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -421,7 +414,6 @@ namespace Swagger {
   
 }
 
-    
 void
 uploadFileProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -469,5 +461,4 @@ namespace Swagger {
 }
 
 
-
 } /* namespace Swagger */